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

Timestamp:

May 8, 2012 6:05:41 PM (13 years ago)

Author:

vboxsync

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

77855

Message:

Frontends: back out the Framebuffer cleanup, to be retried later

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Framebuffer.h (modified) (2 diffs)
• NullFramebuffer.h (modified) (2 diffs)
• VideoCapture/FFmpegFB.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VBoxHeadless/Framebuffer.h

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -42 +42 @@
     }
 #endif
+    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
 
-    BEGIN_COM_MAP(VRDPFramebuffer)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
-    END_COM_MAP()
+    NS_DECL_ISUPPORTS
 
     STDMETHOD(COMGETTER(Width))(ULONG *width);

trunk/src/VBox/Frontends/VBoxHeadless/NullFramebuffer.h

@@ -1 +1 @@
 /*
- * Copyright (C) 2007-2012 Oracle Corporation
+ * Copyright (C) 2010 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -46 +46 @@
     }
 #endif
-
-    BEGIN_COM_MAP(NullFB)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
-    END_COM_MAP()
+    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
+
+    NS_DECL_ISUPPORTS
 
     // public methods only for internal purposes

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

@@ -6 +6 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2007 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -60 +60 @@
     }
 #endif
-
-    BEGIN_COM_MAP(FFmpegFB)
-        VBOX_DEFAULT_INTERFACE_ENTRIES(IFramebuffer)
-    END_COM_MAP()
+    VBOX_SCRIPTABLE_DISPATCH_IMPL(IFramebuffer)
+
+    NS_DECL_ISUPPORTS
 
     // public methods only for internal purposes