libretro/ppsspp
1
0
Fork 0
mirror of https://github.com/libretro/ppsspp.git synced 2024-11-30 11:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Accept any negative channel as autoselect.

Browse Source 
And fix error codes in sceAudioChReserve().
This commit is contained in:
Unknown W. Brackets 2013-05-15 22:49:54 -07:00
parent 50f8466ee8
commit 3f8c920436
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Core/HLE/sceAudio.cpp
View File

@ -163,11 +163,15 @@ static u32 GetFreeChannel() {
} }
u32 sceAudioChReserve(u32 chan, u32 sampleCount, u32 format) { u32 sceAudioChReserve(u32 chan, u32 sampleCount, u32 format) {
if (chan == (u32)-1) { if ((int)chan < 0) {
chan = GetFreeChannel(); chan = GetFreeChannel();
if ((int)chan < 0) {
ERROR_LOG(HLE, "sceAudioChReserve - no channels remaining");
return SCE_ERROR_AUDIO_NO_CHANNELS_AVAILABLE;
}
} }
if (chan >= PSP_AUDIO_CHANNEL_MAX) { if (chan >= PSP_AUDIO_CHANNEL_MAX) {
ERROR_LOG(HLE ,"sceAudioChReserve(%08x, %08x, %08x) - bad channel", chan, sampleCount, format); ERROR_LOG(HLE, "sceAudioChReserve(%08x, %08x, %08x) - bad channel", chan, sampleCount, format);
return SCE_ERROR_AUDIO_INVALID_CHANNEL; return SCE_ERROR_AUDIO_INVALID_CHANNEL;
} }
if (format != PSP_AUDIO_FORMAT_MONO && format != PSP_AUDIO_FORMAT_STEREO) { if (format != PSP_AUDIO_FORMAT_MONO && format != PSP_AUDIO_FORMAT_STEREO) {
@ -175,8 +179,8 @@ u32 sceAudioChReserve(u32 chan, u32 sampleCount, u32 format) {
return SCE_ERROR_AUDIO_INVALID_FORMAT; return SCE_ERROR_AUDIO_INVALID_FORMAT;
} }
if (chans[chan].reserved) { if (chans[chan].reserved) {
ERROR_LOG(HLE,"sceAudioChReserve - reserve channel failed"); ERROR_LOG(HLE, "sceAudioChReserve - reserve channel failed");
return SCE_ERROR_AUDIO_NO_CHANNELS_AVAILABLE; return SCE_ERROR_AUDIO_INVALID_CHANNEL;
} }
DEBUG_LOG(HLE, "sceAudioChReserve(%08x, %08x, %08x)", chan, sampleCount, format); DEBUG_LOG(HLE, "sceAudioChReserve(%08x, %08x, %08x)", chan, sampleCount, format);