Changeset 51693 in vbox

Timestamp:

Jun 23, 2014 4:04:07 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94475

Message:

FE/Qt: Runtime UI: Small cleanup for [I/C]Framebuffer usage.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIFrameBuffer.cpp (modified) (4 diffs)
• UIFrameBuffer.h (modified) (3 diffs)
• UIMouseHandler.cpp (modified) (1 diff)
• UISession.cpp (modified) (1 diff)

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

@@ -265 +265 @@
 }
 
-STDMETHODIMP UIFrameBuffer::NotifyUpdateImage(ULONG aX,
-                                              ULONG aY,
-                                              ULONG aWidth,
-                                              ULONG aHeight,
-                                              ComSafeArrayIn(BYTE, aImage))
-{
+STDMETHODIMP UIFrameBuffer::NotifyUpdateImage(ULONG uX, ULONG uY,
+                                              ULONG uWidth, ULONG uHeight,
+                                              ComSafeArrayIn(BYTE, image))
+{
+    Q_UNUSED(uX);
+    Q_UNUSED(uY);
+    Q_UNUSED(uWidth);
+    Q_UNUSED(uHeight);
+    Q_UNUSED(image);
     return E_NOTIMPL;
 }
@@ -409 +412 @@
 }
 
-STDMETHODIMP UIFrameBuffer::Notify3DEvent(ULONG uType, ComSafeArrayIn(BYTE, aData))
+STDMETHODIMP UIFrameBuffer::Notify3DEvent(ULONG uType, ComSafeArrayIn(BYTE, data))
 {
     /* Lock access to frame-buffer: */
@@ -426 +429 @@
     }
 
-    com::SafeArray<BYTE> data(ComSafeArrayInArg(aData));
+    com::SafeArray<BYTE> eventData(ComSafeArrayInArg(data));
     switch (uType)
     {
@@ -433 +436 @@
             /* Notify machine-view with the async-signal
              * about 3D overlay visibility change: */
-            BOOL fVisible = data[0];
+            BOOL fVisible = eventData[0];
             LogRel2(("UIFrameBuffer::Notify3DEvent: Sending to async-handler: "
                      "(VBOX3D_NOTIFY_EVENT_TYPE_VISIBLE_3DDATA = %s)\n",

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

@@ -27 +27 @@
 
 /* COM includes: */
-#include "CFramebuffer.h"
 #include "CDisplaySourceBitmap.h"
 
@@ -127 +126 @@
       * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
     STDMETHOD(NotifyUpdate)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight);
-    STDMETHOD(NotifyUpdateImage)(ULONG x, ULONG y, ULONG w, ULONG h, ComSafeArrayIn(BYTE, aImage));
+    /** EMT callback which is not used in current implementation. */
+    STDMETHOD(NotifyUpdateImage)(ULONG uX, ULONG uY, ULONG uWidth, ULONG uHeight, ComSafeArrayIn(BYTE, image));
 
     /** EMT callback: Returns whether the frame-buffer implementation is willing to support a given video-mode.
@@ -155 +155 @@
       * @note         Any EMT callback is subsequent. No any other EMT callback can be called until this one processed.
       * @note         Calls to this and #setMarkAsUnused method are synchronized (from GUI side). */
-    STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, aData));
+    STDMETHOD(Notify3DEvent)(ULONG uType, ComSafeArrayIn(BYTE, data));
 
     /** Returns frame-buffer data address. */

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

@@ -61 +61 @@
 #include "CConsole.h"
 #include "CMouse.h"
-#include "CFramebuffer.h"
 #include "CDisplay.h"
 

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

@@ -70 +70 @@
 #include "CMediumAttachment.h"
 #include "CDisplay.h"
-#include "CFramebuffer.h"
 #include "CNetworkAdapter.h"
 #include "CHostNetworkInterface.h"