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

Timestamp:

Feb 28, 2008 6:43:08 PM (17 years ago)

Author:

vboxsync

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

28520

Message:

Main: Reworked enums to avoid 1) weird duplication of enum name when referring to enum values in cross-platform code; 2) possible clashes on Win32 due to putting identifiers like Paused or Disabled to the global namespace (via C enums). In the new style, enums are used like this: a) USBDeviceState_T v = USBDeviceState_Busy from cross-platform non-Qt code; b) KUSBDeviceState v = KUSBDeviceState_Busy from Qt code; c) USBDeviceState v = USBDeviceState_Busy from plain Win32 and d) PRUInt32 USBDeviceState v = USBDeviceState::Busy from plain XPCOM.

File:

• trunk/src/VBox/Frontends/VBoxHeadless/VideoCapture/FFmpegFB.cpp (modified) (8 diffs)

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

@@ -76 +76 @@
                    com::Bstr filename) :
     mBitRate(bitrate),
-    mPixelFormat(FramebufferPixelFormat_PixelFormatOpaque),
+    mPixelFormat(FramebufferPixelFormat_Opaque),
     mBitsPerPixel(0),
     mFileName(filename),
@@ -142 +142 @@
         for (int i = 10*25; i > 0; i--)
             do_encoding_and_write();
-#endif 
+#endif
         /* write a png file of the last frame */
         write_png();
@@ -210 +210 @@
     /* Set the initial framebuffer size to the mpeg frame dimensions */
     BOOL finished;
-    RequestResize(0, FramebufferPixelFormat_PixelFormatOpaque, NULL, 0, 0,
+    RequestResize(0, FramebufferPixelFormat_Opaque, NULL, 0, 0,
                   mFrameWidth, mFrameHeight, &finished);
     /* Start counting time */
@@ -272 +272 @@
  * Return the colour depth of our frame buffer.  Note that we actually
  * store the pixel format, not the colour depth internally, since
- * when display sets FramebufferPixelFormat_PixelFormatOpaque, it
- * wants to retreive FramebufferPixelFormat_PixelFormatOpaque and
+ * when display sets FramebufferPixelFormat_Opaque, it
+ * wants to retreive FramebufferPixelFormat_Opaque and
  * nothing else.
  *
@@ -482 +482 @@
  * we have chosen, and the other COMGETTER methods tell the device about
  * the layout of our buffer.  We currently handle all VRAM layouts except
- * FramebufferPixelFormat_PixelFormatOpaque (which cannot be handled by
+ * FramebufferPixelFormat_Opaque (which cannot be handled by
  * definition).
  */
@@ -644 +644 @@
 }
 
-/** Stubbed */    
+/** Stubbed */
 STDMETHODIMP FFmpegFB::GetVisibleRegion(BYTE *rectangles, ULONG /* count */, ULONG * /* countCopied */)
 {
@@ -653 +653 @@
 }
 
-/** Stubbed */    
+/** Stubbed */
 STDMETHODIMP FFmpegFB::SetVisibleRegion(BYTE *rectangles, ULONG /* count */)
 {
@@ -720 +720 @@
     if (!mpFormatContext->max_delay)
         mpFormatContext->max_delay = (int)(0.7 * AV_TIME_BASE);
-#endif 
+#endif
     return S_OK;
 }