Better events

src/EventBroker.cpp

@@ -12,50 +12,50 @@ BaseEventRelay::~BaseEventRelay()
 
 void EventBroker::Unsubscribe(BaseEventRelay &relay) // ?
 {
-	/*auto itpair = m_Subscribers.equal_range(relay.m_EventTypeName);
+	auto contextIt = m_ContextRelays.find(relay.m_ContextTypeName);
+	if (contextIt == m_ContextRelays.end())
+		return;
+
+	auto eventRelays = contextIt->second;
+
+	auto itpair = eventRelays.equal_range(relay.m_EventTypeName);
 	for (auto it = itpair.first; it != itpair.second; ++it)
 	{
-	if (it->second == &relay)
-	{
-	m_Subscribers.erase(it);
-	break;
+		if (it->second == &relay)
+		{
+			eventRelays.erase(it);
+			break;
+		}
 	}
-	}*/
 }
 
 void EventBroker::Subscribe(BaseEventRelay &relay)
 {
 	relay.m_Broker = this;
-	m_ContextSubscribers[relay.m_ContextTypeName][relay.m_EventTypeName] = &relay;
+	m_ContextRelays[relay.m_ContextTypeName].insert(std::make_pair(relay.m_EventTypeName, &relay));
 }
 
 int EventBroker::Process(std::string contextTypeName)
 {
-	auto it = m_ContextSubscribers.find(contextTypeName);
-	if (it == m_ContextSubscribers.end())
+	auto it = m_ContextRelays.find(contextTypeName);
+	if (it == m_ContextRelays.end())
 		return 0;
 
-	int eventsProcessed = 0;
-
 	EventRelays_t &relays = it->second;
+
+	int eventsProcessed = 0;
 	for (auto &pair : *m_EventQueueRead)
 	{
 		std::string &eventTypeName = pair.first;
 		std::shared_ptr<Event> event = pair.second;
 
-		/*if (eventTypeName == "struct Events::BindKey")
+		auto itpair = relays.equal_range(eventTypeName);
+		for (auto it2 = itpair.first; it2 != itpair.second; ++it2)
 		{
-			auto bindKey = static_cast<Events::BindKey*>(event.get());
-			LOG_DEBUG("HsssEJ");
-		}*/
-
-		auto it2 = relays.find(eventTypeName);
-		if (it2 == relays.end())
-			continue;
-
-		auto relay = it2->second;
-		relay->Receive(event);
-		eventsProcessed++;
+			auto relay = it2->second;
+			relay->Receive(event);
+			eventsProcessed++;
+		}
 	}
 
 	return eventsProcessed;