Changeset 35722 in vbox for trunk/src/VBox/Frontends/VBoxSDL

Timestamp:

Jan 26, 2011 4:37:16 PM (14 years ago)

Author:

vboxsync

Message:

Main: reworked listener objects creation, fixes Win problems with events, few cleanups

File:

• trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VBoxSDL/VBoxSDL.cpp

@@ -245 +245 @@
     }
 
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
+    {
+    }
+
     STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
     {
@@ -287 +296 @@
 
     virtual ~VBoxSDLEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -347 +365 @@
 
     virtual ~VBoxSDLConsoleEventListener()
+    {
+    }
+
+    HRESULT init()
+    {
+        return S_OK;
+    }
+
+    void uninit()
     {
     }
@@ -772 +799 @@
     uint32_t memorySize = 0;
     uint32_t vramSize = 0;
-    IEventListener *pVBoxClientListener = NULL;
-    IEventListener *pVBoxListener = NULL;
-    VBoxSDLConsoleEventListenerImpl *pConsoleListener = NULL;
+    ComPtr<IEventListener> pVBoxClientListener;
+    ComPtr<IEventListener> pVBoxListener;
+    ComObjPtr<VBoxSDLConsoleEventListenerImpl> pConsoleListener;
 
     bool fFullscreen = false;
@@ -1834 +1861 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(pVirtualBoxClient, COMGETTER(EventSource)(pES.asOutParam()));
-        pVBoxClientListener = new VBoxSDLClientEventListenerImpl();
+        ComObjPtr<VBoxSDLClientEventListenerImpl> listener;
+        listener.createObject();
+        listener->init(new VBoxSDLClientEventListener());
+        pVBoxClientListener = listener;
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnVBoxSVCAvailabilityChanged);
@@ -1844 +1874 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(pVirtualBox, COMGETTER(EventSource)(pES.asOutParam()));
-        pVBoxListener = new VBoxSDLEventListenerImpl();
+        ComObjPtr<VBoxSDLEventListenerImpl> listener;
+        listener.createObject();
+        listener->init(new VBoxSDLEventListener());
+        pVBoxListener = listener;
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnExtraDataChanged);
@@ -1854 +1887 @@
         ComPtr<IEventSource> pES;
         CHECK_ERROR(gpConsole, COMGETTER(EventSource)(pES.asOutParam()));
-        pConsoleListener = new VBoxSDLConsoleEventListenerImpl();
+        pConsoleListener.createObject();
+        pConsoleListener->init(new VBoxSDLConsoleEventListener());
         com::SafeArray<VBoxEventType_T> eventTypes;
         eventTypes.push_back(VBoxEventType_OnMousePointerShapeChanged);