archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-11 09:18:40 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Conflicts fixed

Browse source
This commit is contained in:
Nekotekina 2014-04-04 18:43:43 +04:00
commit c6c6dbe546
102 changed files with 3039 additions and 3008 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -319,19 +319,20 @@ int cellAudioInit()
const u64 stamp1 = get_system_time();
if (!first_mix)
if (first_mix)
{
oal_buffer_offset += sizeof(buf2ch) / sizeof(float);
memset(&oal_buffer[oal_pos][0], 0, oal_buffer_size * sizeof(u16));
}
oal_buffer_offset += sizeof(buf2ch) / sizeof(float);
if(oal_buffer_offset >= oal_buffer_size)
if(oal_buffer_offset >= oal_buffer_size)
{
if(m_audio_out)
{
if(m_audio_out)
{
queue.Push(&oal_buffer[oal_pos][0]);
}
oal_buffer_offset = 0;
queue.Push(&oal_buffer[oal_pos][0]);
}
oal_buffer_offset = 0;
}
const u64 stamp2 = get_system_time();