diff --git a/Core/HLE/sceMp3.cpp b/Core/HLE/sceMp3.cpp index 6e21291c64..f73ea438aa 100644 --- a/Core/HLE/sceMp3.cpp +++ b/Core/HLE/sceMp3.cpp @@ -511,7 +511,7 @@ static int sceMp3GetLoopNum(u32 mp3) { return hleLogError(ME, ERROR_MP3_UNRESERVED_HANDLE, "incorrect handle type"); } - return hleLogSuccessI(ME, ctx->AuGetLoopNum()); + return hleLogSuccessI(ME, ctx->LoopNum); } static int sceMp3GetMaxOutputSample(u32 mp3) { @@ -555,7 +555,8 @@ static int sceMp3SetLoopNum(u32 mp3, int loop) { if (loop < 0) loop = -1; - return hleLogSuccessI(ME, ctx->AuSetLoopNum(loop)); + ctx->LoopNum = loop; + return hleLogSuccessI(ME, 0); } static int sceMp3GetMp3ChannelNum(u32 mp3) { diff --git a/Core/HLE/sceMp4.cpp b/Core/HLE/sceMp4.cpp index c804013641..a716e8fa78 100644 --- a/Core/HLE/sceMp4.cpp +++ b/Core/HLE/sceMp4.cpp @@ -301,7 +301,7 @@ static u32 sceAacGetLoopNum(u32 id) ERROR_LOG(ME, "%s: bad aac id %08x", __FUNCTION__, id); return -1; } - return ctx->AuGetLoopNum(); + return ctx->LoopNum; } static u32 sceAacSetLoopNum(u32 id, int loop) @@ -313,7 +313,8 @@ static u32 sceAacSetLoopNum(u32 id, int loop) return -1; } - return ctx->AuSetLoopNum(loop); + ctx->LoopNum = loop; + return 0; } static int sceAacCheckStreamDataNeeded(u32 id) diff --git a/Core/HW/SimpleAudioDec.cpp b/Core/HW/SimpleAudioDec.cpp index b6da4d59ff..f5732af453 100644 --- a/Core/HW/SimpleAudioDec.cpp +++ b/Core/HW/SimpleAudioDec.cpp @@ -458,17 +458,6 @@ u32 AuCtx::AuDecode(u32 pcmAddr) { return outpcmbufsize; } -u32 AuCtx::AuGetLoopNum() -{ - return LoopNum; -} - -u32 AuCtx::AuSetLoopNum(int loop) -{ - LoopNum = loop; - return 0; -} - // return 1 to read more data stream, 0 don't read int AuCtx::AuCheckStreamDataNeeded() { // If we would ask for bytes, then some are needed. diff --git a/Core/HW/SimpleAudioDec.h b/Core/HW/SimpleAudioDec.h index c23a57b97d..dd18ee60c2 100644 --- a/Core/HW/SimpleAudioDec.h +++ b/Core/HW/SimpleAudioDec.h @@ -73,10 +73,6 @@ public: int AuStreamWorkareaSize(); u32 AuResetPlayPosition(); u32 AuResetPlayPositionByFrame(int position); - - u32 AuSetLoopNum(int loop); - u32 AuGetLoopNum(); - u32 AuGetInfoToAddStreamData(u32 bufPtr, u32 sizePtr, u32 srcPosPtr); void SetReadPos(int pos) { readPos = pos; }