Changeset 19817 in vbox for trunk/src/VBox/Frontends/VBoxHeadless

Timestamp:

May 19, 2009 12:16:28 PM (16 years ago)

Author:

vboxsync

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

47467

Message:

IFramebuffer cleanup next part:

• removed obsolete internal framebuffer
• removed IFramebuffer::setupInternalFramebuffer(), IFramebuffer::lockFramebuffer(), IFramebuffer::unlockFramebuffer(), IFramebuffer::registerExternalFramebuffer()
• removed unused finished parameter of IFramebuffer::NotifyUpdate()

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• VBoxHeadless.cpp (modified) (2 diffs)
• VideoCapture/FFmpegFB.cpp (modified) (3 diffs)
• VideoCapture/FFmpegFB.h (modified) (1 diff)

trunk/src/VBox/Frontends/VBoxHeadless/VBoxHeadless.cpp

@@ -46 +46 @@
 #include <iprt/env.h>
 #include <VBox/err.h>
+#include <VBox/VBoxVideo.h>
 
 #ifdef VBOX_FFMPEG
@@ -744 +745 @@
                 Log2(("VBoxHeadless: Registering framebuffer\n"));
                 pFramebuffer->AddRef();
-                display->RegisterExternalFramebuffer(pFramebuffer);
+                display->SetFramebuffer(VBOX_VIDEO_PRIMARY_SCREEN, pFramebuffer);
             }
             if (!RT_SUCCESS(rrc) || (rcc != S_OK))

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp

@@ -142 +142 @@
         {
             /* Dummy update to make sure we get all the frame (timing). */
-            BOOL dummy;
-            NotifyUpdate(0, 0, 0, 0, &dummy);
+            NotifyUpdate(0, 0, 0, 0);
             /* Write the last pending frame before exiting */
             int rc = do_rgb_to_yuv_conversion();
@@ -431 +430 @@
  * @param w        width of the area which has been updated
  * @param h        height of the area which has been updated
- * @param finished
- */
-STDMETHODIMP FFmpegFB::NotifyUpdate(ULONG x, ULONG y, ULONG w, ULONG h,
-                                    BOOL *finished)
+ */
+STDMETHODIMP FFmpegFB::NotifyUpdate(ULONG x, ULONG y, ULONG w, ULONG h)
 {
     int rc;
@@ -442 +439 @@
               (unsigned long) x,  (unsigned long) y,  (unsigned long) w,
                (unsigned long) h));
-    if (!finished)
-        return E_POINTER;
-    /* For now we will do things synchronously */
-    *finished = true;
+
     /* We always leave at least one frame update pending, which we
        process when the time until the next frame has elapsed. */

trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.h

@@ -100 +100 @@
     STDMETHOD(COMGETTER(WinId)) (ULONG64 *winId);
 
-    STDMETHOD(NotifyUpdate)(ULONG x, ULONG y,
-                            ULONG w, ULONG h, BOOL *finished);
+    STDMETHOD(NotifyUpdate)(ULONG x, ULONG y, ULONG w, ULONG h);
     STDMETHOD(RequestResize)(ULONG aScreenId, ULONG pixelFormat, BYTE *vram,
                              ULONG bitsPerPixel, ULONG bytesPerLine,