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

Timestamp:

Nov 11, 2010 10:23:42 AM (14 years ago)

Author:

vboxsync

Message:

Main: moved listeners to location usable by fronends, rework

File:

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

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

@@ -233 +233 @@
  * Event handler for VirtualBox events
  */
-class VBoxSDLEventListener :
-  VBOX_SCRIPTABLE_IMPL(IEventListener)
+class VBoxSDLEventListener
 {
 public:
     VBoxSDLEventListener()
     {
-#if defined(RT_OS_WINDOWS)
-        refcnt = 0;
-#endif
     }
 
@@ -248 +244 @@
     }
 
-#ifdef RT_OS_WINDOWS
-    STDMETHOD_(ULONG, AddRef)()
-    {
-        return ::InterlockedIncrement(&refcnt);
-    }
-    STDMETHOD_(ULONG, Release)()
-    {
-        long cnt = ::InterlockedDecrement(&refcnt);
-        if (cnt == 0)
-            delete this;
-        return cnt;
-    }
-#endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IEventListener)
-
-    NS_DECL_ISUPPORTS
-
-
-    STDMETHOD(HandleEvent)(IEvent * aEvent)
-    {
-        VBoxEventType_T aType = VBoxEventType_Invalid;
-
-        aEvent->COMGETTER(Type)(&aType);
+    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
+    {
         switch (aType)
         {
@@ -312 +287 @@
         return S_OK;
     }
-
-private:
-#ifdef RT_OS_WINDOWS
-    long refcnt;
-#endif
-
 };
 
@@ -323 +292 @@
  * Event handler for machine events
  */
-class VBoxSDLConsoleEventListener :
-    VBOX_SCRIPTABLE_IMPL(IEventListener)
+class VBoxSDLConsoleEventListener
 {
 public:
     VBoxSDLConsoleEventListener() : m_fIgnorePowerOffEvents(false)
     {
-#if defined(RT_OS_WINDOWS)
-        refcnt = 0;
-#endif
     }
 
@@ -338 +303 @@
     }
 
-#ifdef RT_OS_WINDOWS
-    STDMETHOD_(ULONG, AddRef)()
-    {
-        return ::InterlockedIncrement(&refcnt);
-    }
-    STDMETHOD_(ULONG, Release)()
-    {
-        long cnt = ::InterlockedDecrement(&refcnt);
-        if (cnt == 0)
-            delete this;
-        return cnt;
-    }
-#endif
-    VBOX_SCRIPTABLE_DISPATCH_IMPL(IEventListener)
-
-    NS_DECL_ISUPPORTS
-
-    STDMETHOD(HandleEvent)(IEvent * aEvent)
-    {
-        VBoxEventType_T aType = VBoxEventType_Invalid;
-
-        aEvent->COMGETTER(Type)(&aType);
+    STDMETHOD(HandleEvent)(VBoxEventType_T aType, IEvent * aEvent)
+    {
         // likely all this double copy is now excessive, and we can just use existing event object
         // @todo: eliminate it
@@ -567 +512 @@
 
 private:
-#ifdef RT_OS_WINDOWS
-    long refcnt;
-#endif
     bool m_fIgnorePowerOffEvents;
 };
 
-#ifdef VBOX_WITH_XPCOM
-NS_DECL_CLASSINFO(VBoxSDLEventListener)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VBoxSDLEventListener, IEventListener)
-NS_DECL_CLASSINFO(VBoxSDLConsoleEventListener)
-NS_IMPL_THREADSAFE_ISUPPORTS1_CI(VBoxSDLConsoleEventListener, IEventListener)
-#endif /* VBOX_WITH_XPCOM */
 
 static void show_usage()