Changeset 41216 in vbox for trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

Timestamp:

May 8, 2012 6:05:41 PM (13 years ago)

Author:

vboxsync

Message:

Frontends: back out the Framebuffer cleanup, to be retried later

File:

• trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VBoxSDL/Framebuffer.cpp

@@ -75 +75 @@
 //
 
-HRESULT VBoxSDLFB::FinalConstruct()
-{
-    return S_OK;
-}
-
-/**
- * SDL framebuffer init method. It is called from the main
+/**
+ * SDL framebuffer constructor. It is called from the main
  * (i.e. SDL) thread. Therefore it is safe to use SDL calls
  * here.
- * @returns COM status code
  * @param fFullscreen    flag whether we start in fullscreen mode
  * @param fResizable     flag whether the SDL window should be resizable
@@ -93 +87 @@
  * @param iFixedHeight   fixed SDL height (-1 means not set)
  */
-HRESULT VBoxSDLFB::init(uint32_t uScreenId,
-                        bool fFullscreen, bool fResizable, bool fShowSDLConfig,
-                        bool fKeepHostRes, uint32_t u32FixedWidth,
-                        uint32_t u32FixedHeight, uint32_t u32FixedBPP)
+VBoxSDLFB::VBoxSDLFB(uint32_t uScreenId,
+                     bool fFullscreen, bool fResizable, bool fShowSDLConfig,
+                     bool fKeepHostRes, uint32_t u32FixedWidth,
+                     uint32_t u32FixedHeight, uint32_t u32FixedBPP)
 {
     int rc;
-    LogFlow(("VBoxSDLFB::init\n"));
+    LogFlow(("VBoxSDLFB::VBoxSDLFB\n"));
+
+#if defined (RT_OS_WINDOWS)
+    refcnt = 0;
+#endif
 
     mScreenId       = uScreenId;
@@ -140 +138 @@
     Assert(mScreen);
     mfInitialized = true;
-
-    return S_OK;
-}
-
-void VBoxSDLFB::FinalRelease()
-{
-    uninit();
-}
-
-void VBoxSDLFB::uninit()
-{
-    LogFlow(("VBoxSDLFB::uninit\n"));
+}
+
+VBoxSDLFB::~VBoxSDLFB()
+{
+    LogFlow(("VBoxSDLFB::~VBoxSDLFB\n"));
     if (mSurfVRAM)
     {
@@ -169 +160 @@
 }
 
-bool VBoxSDLFB::initSDL(bool fShowSDLConfig)
+bool VBoxSDLFB::init(bool fShowSDLConfig)
 {
     LogFlow(("VBoxSDLFB::init\n"));
@@ -249 +240 @@
  * @remarks must be called from the SDL thread!
  */
-void VBoxSDLFB::uninitSDL()
+void VBoxSDLFB::uninit()
 {
     if (gfSdlInitialized)