RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-05 22:47:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

IdManager improved, atomic_t improved

Browse source 
Various changes
This commit is contained in:
Nekotekina 2015-05-27 06:11:59 +03:00
parent cdf70e0b77
commit 22b78fec71
69 changed files with 4304 additions and 4098 deletions
Download patch file Download diff file Expand all files Collapse all files

10
rpcs3/Emu/Event.cpp
View file

@ -28,9 +28,9 @@ bool EventManager::CheckKey(u64 key)
return eq_map.find(key) != eq_map.end();
}
bool EventManager::RegisterKey(std::shared_ptr<event_queue_t>& data, u64 key)
bool EventManager::RegisterKey(const std::shared_ptr<lv2_event_queue_t>& data)
{
if (!key)
if (!data->key)
{
// always ok
return true;
@ -38,12 +38,12 @@ bool EventManager::RegisterKey(std::shared_ptr<event_queue_t>& data, u64 key)
std::lock_guard<std::mutex> lock(m_lock);
if (eq_map.find(key) != eq_map.end())
if (eq_map.find(data->key) != eq_map.end())
{
return false;
}
eq_map[key] = data;
eq_map[data->key] = data;
return true;
}
@ -68,7 +68,7 @@ bool EventManager::UnregisterKey(u64 key)
return false;
}
std::shared_ptr<event_queue_t> EventManager::GetEventQueue(u64 key)
std::shared_ptr<lv2_event_queue_t> EventManager::GetEventQueue(u64 key)
{
if (!key)
{