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

Timestamp:

Jun 5, 2014 7:35:49 AM (11 years ago)

Author:

vboxsync

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

94189

Message:

VBoxHeadless: Framebuffer implementation is not needed anymore.

Location:

trunk/src/VBox/Frontends/VBoxHeadless

Files:

• Framebuffer.cpp (deleted)
• Framebuffer.h (deleted)
• Makefile.kmk (modified) (1 diff)
• NullFramebuffer.h (deleted)
• VBoxHeadless.cpp (modified) (7 diffs)
• VBoxHeadless.h (deleted)

trunk/src/VBox/Frontends/VBoxHeadless/Makefile.kmk

@@ -46 +46 @@
 VBoxHeadless_DEFS      += $(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
 VBoxHeadless_SOURCES    = VBoxHeadless.cpp
-VBoxHeadless_SOURCES  += Framebuffer.cpp
 ifdef VBOX_WITH_GUEST_PROPS
  VBoxHeadless_DEFS     += VBOX_WITH_GUEST_PROPS

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

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2012 Oracle Corporation
+ * Copyright (C) 2006-2014 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -53 +53 @@
 #include <signal.h>
 #endif
-
-#include "Framebuffer.h"
-
-#include "NullFramebuffer.h"
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -635 +631 @@
 static CComModule _Module;
 #endif
-
-ComPtr<IDisplay> display;
 
 /**
@@ -966 +960 @@
         CHECK_ERROR_BREAK(console, COMGETTER(Machine)(machine.asOutParam()));
 
+        ComPtr<IDisplay> display;
         CHECK_ERROR_BREAK(console, COMGETTER(Display)(display.asOutParam()));
 
@@ -978 +973 @@
         }
 #endif /* defined(VBOX_WITH_VPX) */
-        ULONG cMonitors = 1;
-        machine->COMGETTER(MonitorCount)(&cMonitors);
-
-        unsigned uScreenId;
-        for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
-        {
-            VRDPFramebuffer *pVRDPFramebuffer = new VRDPFramebuffer();
-            if (!pVRDPFramebuffer)
-            {
-                RTPrintf("Error: could not create framebuffer object %d\n", uScreenId);
-                break;
-            }
-            pVRDPFramebuffer->AddRef();
-            display->AttachFramebuffer(uScreenId, pVRDPFramebuffer);
-        }
-        if (uScreenId < cMonitors)
-        {
-            break;
-        }
-
-        // fill in remaining slots with null framebuffers
-        for (uScreenId = 0; uScreenId < cMonitors; uScreenId++)
-        {
-            ComPtr<IFramebuffer> fb;
-            HRESULT hrc2 = display->QueryFramebuffer(uScreenId,
-                                                     fb.asOutParam());
-            if (hrc2 == S_OK && fb.isNull())
-            {
-                NullFB *pNullFB =  new NullFB();
-                pNullFB->AddRef();
-                pNullFB->init();
-                display->AttachFramebuffer(uScreenId, pNullFB);
-            }
-        }
 
         /* get the machine debugger (isn't necessarily available) */
@@ -1279 +1240 @@
     while (0);
 
-    display.setNull();
-
     /*
      * Get the machine state.
@@ -1405 +1364 @@
 }
 #endif /* !VBOX_WITH_HARDENING */
-
-#ifdef VBOX_WITH_XPCOM
-NS_DECL_CLASSINFO(NullFB)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(NullFB, IFramebuffer)
-#endif