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

Merge pull request #2092 from oioitff/audio-fix

Browse source 
Finally fix choppy cg audio, bgm, and even some missing bgm, voice, se.
This commit is contained in:
Henrik Rydgård 2013-06-05 08:25:36 -07:00
commit 1c1104538b
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Core/HLE/sceAudio.cpp
View file

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