mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 17:11:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cellAudio: Fix event queue attachment

Browse Source
This commit is contained in:
Eladash 2020-06-04 20:54:31 +03:00 committed by Ivan
parent aa4fdff82c
commit ff04cd6d69
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
rpcs3/Emu/Cell/Modules/cellAudio.cpp
View File

@ -460,7 +460,7 @@ void cell_audio_thread::advance(u64 timestamp, bool reset)
for (const auto& key_inf : keys)
{
if (const auto queue = lv2_event_queue::find(key_inf.key))
if ((queues[queue_count] = key_inf.port.lock()))
{
if (key_inf.flags & CELL_AUDIO_EVENTFLAG_NOMIX)
{
@ -483,11 +483,12 @@ void cell_audio_thread::advance(u64 timestamp, bool reset)
if ((event_period ^ key_inf.start_period) & (periods - 1))
{
// The time has not come for this key to receive event
queues[queue_count].reset();
continue;
}
event_sources[queue_count] = key_inf.source;
queues[queue_count++] = queue;
queue_count++;
}
}
@ -1429,21 +1430,35 @@ error_code AudioSetNotifyEventQueue(u64 key, u32 iFlags)
return CELL_AUDIO_ERROR_NOT_INIT;
}
if (!lv2_event_queue::find(key))
auto q = lv2_event_queue::find(key);
if (!q)
{
return CELL_AUDIO_ERROR_TRANS_EVENT;
}
for (const auto& k : g_audio->keys) // check for duplicates
for (auto i = g_audio->keys.cbegin(); i != g_audio->keys.cend();) // check for duplicates
{
if (k.key == key)
auto port = i->port.lock();
if (port == q)
{
return CELL_AUDIO_ERROR_TRANS_EVENT;
}
if (!lv2_event_queue::check(port))
{
// Cleanup, avoid cases where there are multiple ports with the same key
i = g_audio->keys.erase(i);
}
else
{
i++;
}
}
// Set unique source associated with the key
g_audio->keys.push_back({g_audio->event_period, iFlags, ((process_getpid() + u64{}) << 32) + lv2_event_port::id_base + (g_audio->key_count++ * lv2_event_port::id_step), key});
g_audio->keys.push_back({g_audio->event_period, iFlags, ((process_getpid() + u64{}) << 32) + lv2_event_port::id_base + (g_audio->key_count++ * lv2_event_port::id_step), std::move(q)});
g_audio->key_count %= lv2_event_port::id_count;
return CELL_OK;
@ -1481,7 +1496,7 @@ error_code AudioRemoveNotifyEventQueue(u64 key, u32 iFlags)
for (auto i = g_audio->keys.cbegin(); i != g_audio->keys.cend(); i++)
{
if (i->key == key)
if ([&](auto port){ return lv2_event_queue::check(port) && port->key == key; }(i->port.lock()))
{
if (i->flags != iFlags)
{

4
rpcs3/Emu/Cell/Modules/cellAudio.h
View File

@ -6,6 +6,8 @@
#include "Emu/Audio/AudioBackend.h"
#include "Emu/Audio/AudioDumper.h"
struct lv2_event_queue;
// Error codes
enum CellAudioError : u32
{
@ -358,7 +360,7 @@ public:
u8 start_period; // Starting event_period
u32 flags; // iFlags
u64 source; // Event source
u64 key; // Key
std::weak_ptr<lv2_event_queue> port; // Underlying event port
};
std::vector<key_info> keys;