RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-04 14:08:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improved AudioThread interface, added XAudio2 audio output

Browse source
This commit is contained in:
Oil 2015-01-11 03:46:10 +04:00
parent e6e60795b7
commit b5c33ec26b
12 changed files with 289 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

30
rpcs3/Emu/SysCalls/Modules/cellAudio.cpp
View file

@ -81,16 +81,14 @@ int cellAudioInit()
std::vector<u64> keys;
if(m_audio_out)
{
m_audio_out->Init();
Emu.GetAudioManager().GetAudioOut().Init();
// Note: What if the ini value changes?
if (g_is_u16)
m_audio_out->Open(oal_buffer[0].get(), oal_buffer_size * sizeof(s16));
else
m_audio_out->Open(oal_buffer_float[0].get(), oal_buffer_size * sizeof(float));
}
// Note: What if the ini value changes?
if (g_is_u16)
Emu.GetAudioManager().GetAudioOut().Open(oal_buffer[0].get(), oal_buffer_size * sizeof(s16));
else
Emu.GetAudioManager().GetAudioOut().Open(oal_buffer_float[0].get(), oal_buffer_size * sizeof(float));
m_config.start_time = get_system_time();
@ -112,7 +110,7 @@ int cellAudioInit()
{
if (oal_buffer)
{
m_audio_out->AddData(oal_buffer, oal_buffer_size * sizeof(s16));
Emu.GetAudioManager().GetAudioOut().AddData(oal_buffer, oal_buffer_size * sizeof(s16));
continue;
}
}
@ -120,7 +118,7 @@ int cellAudioInit()
{
if (oal_buffer_float)
{
m_audio_out->AddData(oal_buffer_float, oal_buffer_size * sizeof(float));
Emu.GetAudioManager().GetAudioOut().AddData(oal_buffer_float, oal_buffer_size * sizeof(float));
continue;
}
}
@ -366,14 +364,10 @@ int cellAudioInit()
if(oal_buffer_offset >= oal_buffer_size)
{
if(m_audio_out)
{
if (g_is_u16)
queue.push(&oal_buffer[oal_pos][0]);
queue_float.push(&oal_buffer_float[oal_pos][0]);
}
if (g_is_u16)
queue.push(&oal_buffer[oal_pos][0]);
queue_float.push(&oal_buffer_float[oal_pos][0]);
oal_buffer_offset = 0;
}