Changeset 3330 for Core/branches/0075_TR_SCRIPTING/Event/src/Event.cpp

Timestamp:

01/30/10 13:18:29 (6 months ago)

Author:

trichards

Message:

Refactored the Event framework so that I_Event is created in EventService? instead of EventQueue?.

Files:

• Core/branches/0075_TR_SCRIPTING/Event/src/Event.cpp (modified) (6 diffs)

Core/branches/0075_TR_SCRIPTING/Event/src/Event.cpp

@@ -34 +34 @@
 
 #include "EventQueue.hpp"
+#include "EventService.hpp"
 
 #include <Zen/Core/Scripting/forward_declarations.hpp>
@@ -44 +45 @@
 namespace Event {
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
-Event_impl::Event_impl(EventQueue& _queue)
-:   m_queue(_queue)
+Event_impl::Event_impl(EventService& _service)
+:   m_service(_service)
 ,   m_connections()
 ,   m_pMutex(Threading::MutexFactory::create())
@@ -114 +115 @@
 Event_impl::getScriptModule()
 {
-    return m_queue.getScriptModule();
+    return m_service.getScriptModule();
 }
 
 //-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~-~
 I_Connection&
-Event_impl::connect(pAction_type _pAction)
+Event_impl::connect(pAction_type _pAction, I_EventQueue* _pQueue)
 {
     pConnection_type pConnection = new Connection_type(this, _pAction);
 
     Threading::CriticalSection guard(m_pMutex);
+
     m_connections.push_back(pConnection);
+    if (_pQueue)
+    {
+        EventQueue* pQueue = dynamic_cast<EventQueue*>(_pQueue);
+
+        if (pQueue)
+        {
+            m_queues.insert(pQueue);
+        }
+    }
+    else
+    {
+        // Dispatch to the default queue.
+        m_queues.insert(dynamic_cast<EventQueue*>(&m_service.getEventQueue("default")));
+    }
 
     return *pConnection;
@@ -133 +149 @@
 Event_impl::disconnect(Connection_impl* _pConnection)
 {
+    // TODO Keep a refrence count for the queues and
+    // when the last connection is disconnected for a
+    // given queue, remove it from the set.
+
     Threading::CriticalSection guard(m_pMutex);
 
@@ -146 +166 @@
 Event_impl::fireEvent(boost::any _argument)
 {
-    m_queue.queueEvent(this, _argument);
+    Threading::CriticalSection guard(m_pMutex);
+
+    for(Queues_type::iterator iter = m_queues.begin(); iter != m_queues.end(); iter++)
+    {
+        (*iter)->queueEvent(this, _argument);
+    }    
 }
 
@@ -182 +207 @@
 Event_impl::connectScript(boost::any _scriptObject, boost::any _scriptFunction)
 {
-    ScriptAction* pRawAction = new ScriptAction(m_queue.getScriptObject()->getModule(),
+    ScriptAction* pRawAction = new ScriptAction(m_service.getScriptObject()->getModule(),
         _scriptObject, _scriptFunction);
 
     pAction_type pAction(pRawAction, boost::bind(&Event_impl::destroyScriptAction, this, _1));
-    return connect(pAction);
+
+    return connect(pAction, &m_service.getEventQueue("script"));
 }