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

Timestamp:

Mar 26, 2010 10:22:13 AM (15 years ago)

Author:

vboxsync

Message:

2d: more clean 'hacking'

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxFBOverlay.cpp (modified) (3 diffs)
• VBoxFBOverlay.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.cpp

@@ -4045 +4045 @@
             mpOverlayWgt = NULL;
             mOverlayWidgetVisible = false;
-            initGl();
             Assert(!mOverlayVisible);
+            if (pViewport)
+            {
+                initGl();
 //            vboxDoCheckUpdateViewport();
+            }
+            Assert(!mOverlayVisible);
+
         }
         mGlCurrent = false;
@@ -4764 +4769 @@
 }
 
-void VBoxVHWACommandElementProcessor::updatePostEventObject(QObject *m_pObject)
+void VBoxVHWACommandElementProcessor::updatePostEventObject(QObject *pObject)
 {
     int cEventsNeeded = 0;
     const VBoxVHWACommandElement * pFirst;
     RTCritSectEnter(&mCritSect);
-    m_pParent = m_pObject;
+    m_pParent = pObject;
 
     pFirst = m_CmdPipe.contentsRo(NULL);
@@ -4779 +4784 @@
     RTCritSectLeave(&mCritSect);
 
-    for (int i = 0; i < cEventsNeeded; ++i)
-    {
-        VBoxVHWACommandProcessEvent *pCurrentEvent = new VBoxVHWACommandProcessEvent();
-        QApplication::postEvent (m_pParent, pCurrentEvent);
+    if (pObject)
+    {
+        for (int i = 0; i < cEventsNeeded; ++i)
+        {
+            VBoxVHWACommandProcessEvent *pCurrentEvent = new VBoxVHWACommandProcessEvent();
+            QApplication::postEvent (m_pParent, pCurrentEvent);
+        }
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/VBoxFBOverlay.h

@@ -1863 +1863 @@
         : T (pView),
           mpOverlay (pOverlay),
-          mpView (pView)
+          mpView (pView),
+          mbDestroyOverlay (false)
     {}
 
@@ -1869 +1870 @@
         : T (pView),
           mpOverlay (new VBoxQGLOverlay(pWidget, pView, aSession)),
-          mpView (pView)
+          mpView (pView),
+          mbDestroyOverlay (true)
     {}
 
+    virtual ~VBoxOverlayFrameBuffer()
+    {
+        if (mbDestroyOverlay)
+            delete mpOverlay;
+        else
+        {
+            HRESULT hr = Lock();
+            Assert(hr == S_OK);
+            if (SUCCEEDED(hr))
+            {
+                mpOverlay->updateAttachment(NULL, NULL);
+                hr = Unlock();
+                Assert(hr == S_OK);
+            }
+        }
+    }
 
     STDMETHOD(ProcessVHWACommand)(BYTE *pCommand)
@@ -1930 +1948 @@
     VBoxQGLOverlay *mpOverlay;
     V *mpView;
+    bool mbDestroyOverlay;
 };