Emulation/ppsspp
1
0
Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2025-04-02 11:01:50 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert fix in #2092

Browse source
This commit is contained in:
oioitff 2013-06-06 06:04:36 +08:00
parent 9ae044de43
commit 67154f69eb
1 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/HLE/sceAudio.cpp
View file

@ -110,10 +110,7 @@ u32 sceAudioOutputPannedBlocking(u32 chan, int leftvol, int rightvol, u32 sample
chans[chan].rightVolume = rightvol;
}
chans[chan].sampleAddress = samplePtr;
int ret = __AudioEnqueue(chans[chan], chan, true);
if (chans[chan].waitingThreads.size() == 0)
return hleDelayResult(ret, "output block", 1000);
return ret;
return __AudioEnqueue(chans[chan], chan, true);
}
}
@ -324,10 +321,7 @@ u32 sceAudioOutput2OutputBlocking(u32 vol, u32 dataPtr){
chans[PSP_AUDIO_CHANNEL_OUTPUT2].leftVolume = vol;
chans[PSP_AUDIO_CHANNEL_OUTPUT2].rightVolume = vol;
chans[PSP_AUDIO_CHANNEL_OUTPUT2].sampleAddress = dataPtr;
int ret = __AudioEnqueue(chans[PSP_AUDIO_CHANNEL_OUTPUT2], PSP_AUDIO_CHANNEL_OUTPUT2, true);
if (chans[PSP_AUDIO_CHANNEL_OUTPUT2].waitingThreads.size() == 0)
return hleDelayResult(ret, "output block", 1000);
return ret;
return __AudioEnqueue(chans[PSP_AUDIO_CHANNEL_OUTPUT2], PSP_AUDIO_CHANNEL_OUTPUT2, true);
}
u32 sceAudioOutput2ChangeLength(u32 sampleCount){