Changeset 55133 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 8, 2015 1:12:53 PM (10 years ago)

Author:

vboxsync

Message:

Main,Frontends: framebuffer identifier.

Location:

trunk/src/VBox/Frontends

Files:

• VBoxSDL/VBoxSDL.cpp (modified) (3 diffs)
• VirtualBox/src/runtime/UIFrameBuffer.cpp (modified) (3 diffs)

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

@@ -208 +208 @@
 static ULONG       gcMonitors = 1;
 static ComObjPtr<VBoxSDLFB> gpFramebuffer[64];
+static Bstr gaFramebufferId[64];
 static SDL_Cursor *gpDefaultCursor = NULL;
 #ifdef VBOXSDL_WITH_X11
@@ -2008 +2009 @@
     {
         // register our framebuffer
-        rc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i]);
+        rc = gpDisplay->AttachFramebuffer(i, gpFramebuffer[i], gaFramebufferId[i].asOutParam());
         if (FAILED(rc))
         {
@@ -3028 +3029 @@
     {
         for (unsigned i = 0; i < gcMonitors; i++)
-            gpDisplay->DetachFramebuffer(i);
+            gpDisplay->DetachFramebuffer(i, gaFramebufferId[i].raw());
     }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -381 +381 @@
      CComPtr <IUnknown> m_pUnkMarshaler;
 #endif /* Q_OS_WIN */
+     /** Identifier returned by AttachFramebuffer. Used in DetachFramebuffer. */
+     QString m_strFramebufferId;
 };
 
@@ -599 +601 @@
 void UIFrameBufferPrivate::attach()
 {
-    display().AttachFramebuffer(m_uScreenId, CFramebuffer(this));
+    m_strFramebufferId = display().AttachFramebuffer(m_uScreenId, CFramebuffer(this));
 }
 
@@ -606 +608 @@
     CFramebuffer frameBuffer = display().QueryFramebuffer(m_uScreenId);
     if (!frameBuffer.isNull())
-        display().DetachFramebuffer(m_uScreenId);
+    {
+        display().DetachFramebuffer(m_uScreenId, m_strFramebufferId);
+        m_strFramebufferId.clear();
+    }
 }