Changeset 30702 in vbox

Timestamp:

Jul 7, 2010 11:49:42 AM (15 years ago)

Author:

vboxsync

Message:

Main: event source change events

Location:

trunk/src/VBox/Main

Files:

• EventImpl.cpp (modified) (2 diffs)
• idl/VirtualBox.xidl (modified) (2 diffs)

trunk/src/VBox/Main/EventImpl.cpp

@@ -700 +700 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    Listeners::const_iterator it = m->mListeners.find(aListener);
-    if (it != m->mListeners.end())
-        return setError(E_INVALIDARG,
-                        tr("This listener already registered"));
-
-    com::SafeArray<VBoxEventType_T> interested(ComSafeArrayInArg (aInterested));
-    ListenerRecordHolder lrh(new ListenerRecord(aListener, interested, aActive, this));
-    m->mListeners.insert(Listeners::value_type(aListener, lrh));
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        Listeners::const_iterator it = m->mListeners.find(aListener);
+        if (it != m->mListeners.end())
+            return setError(E_INVALIDARG,
+                            tr("This listener already registered"));
+
+        com::SafeArray<VBoxEventType_T> interested(ComSafeArrayInArg (aInterested));
+        ListenerRecordHolder lrh(new ListenerRecord(aListener, interested, aActive, this));
+        m->mListeners.insert(Listeners::value_type(aListener, lrh));
+    }
+
+    VBoxEventDesc evDesc;
+    evDesc.init(this, VBoxEventType_OnEventSourceChange, aListener, TRUE);
+    evDesc.fire(0);
 
     return S_OK;
@@ -721 +727 @@
     if (FAILED(autoCaller.rc())) return autoCaller.rc();
 
-    AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
-
-    Listeners::iterator it = m->mListeners.find(aListener);
     HRESULT rc;
-
-    if (it != m->mListeners.end())
-    {
-        m->mListeners.erase(it);
-        // destructor removes refs from the event map
-        rc = S_OK;
-    }
-    else
-    {
-        rc = setError(VBOX_E_OBJECT_NOT_FOUND,
-                      tr("Listener was never registered"));
+    {
+        AutoWriteLock alock(this COMMA_LOCKVAL_SRC_POS);
+
+        Listeners::iterator it = m->mListeners.find(aListener);
+
+        if (it != m->mListeners.end())
+        {
+            m->mListeners.erase(it);
+            // destructor removes refs from the event map
+            rc = S_OK;
+        }
+        else
+        {
+            rc = setError(VBOX_E_OBJECT_NOT_FOUND,
+                          tr("Listener was never registered"));
+        }
+    }
+
+    if (SUCCEEDED(rc))
+    {
+        VBoxEventDesc evDesc;
+        evDesc.init(this, VBoxEventType_OnEventSourceChange, aListener, FALSE);
+        evDesc.fire(0);
     }
 

trunk/src/VBox/Main/idl/VirtualBox.xidl

@@ -14768 +14768 @@
       </desc>
     </const>
+    <const name="OnEventSourceChange" value="62">
+      <desc>
+        <see>IEventSourceChangeEvent</see>
+      </desc>
+    </const>
     <!-- Last event marker -->
-    <const name="Last" value="62">
+    <const name="Last" value="63">
       <desc>
         Must be last event, used for iterations and structures relying on numerical event values.
@@ -15542 +15547 @@
   </interface>
 
+
+   <interface
+     name="IEventSourceChangeEvent" extends="IEvent"
+     uuid="e7932cb8-f6d4-4ab6-9cbf-558eb8959a6a"
+     waitable="yes"
+     wsmap="managed" autogen="VBoxEvent" id="OnEventSourceChange"
+     >
+    <desc>
+      Notification when an event source state changes (listener added or removed).
+    </desc>
+
+    <attribute name="listener" type="IEventListener" readonly="yes">
+      <desc>
+        Event listener which has changed.
+      </desc>
+    </attribute>
+
+    <attribute name="add" type="boolean" readonly="yes">
+      <desc>
+        Flag whether listener was added or removed.
+      </desc>
+    </attribute>
+  </interface>
+
   <interface
       name="IExtraDataChangeEvent" extends="IEvent"