From 64680a2c68fda0799e7668d151e534688d938e3a Mon Sep 17 00:00:00 2001 From: oioitff Date: Sun, 12 May 2013 21:27:41 +0800 Subject: [PATCH] Revert changes for remainFrame in #1776. --- Core/HLE/sceAtrac.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Core/HLE/sceAtrac.cpp b/Core/HLE/sceAtrac.cpp index 1266c2e565..b64049ed17 100644 --- a/Core/HLE/sceAtrac.cpp +++ b/Core/HLE/sceAtrac.cpp @@ -163,14 +163,10 @@ struct Atrac { // when remainFrames = PSP_ATRAC_ALLDATA_IS_ON_MEMORY . // Still need to find out how getRemainFrames() should work. - if (currentSample >= endSample) - return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; - - if ((first.fileoffset >= first.filesize) && (currentSample > loopEndSample)) - return PSP_ATRAC_ALLDATA_IS_ON_MEMORY; - int remainFrame; - if (decodePos > first.size) { + if (first.fileoffset >= first.filesize || currentSample >= endSample) + remainFrame = PSP_ATRAC_ALLDATA_IS_ON_MEMORY; + else if (decodePos > first.size) { // There are not enough atrac data right now to play at a certain position. // Must load more atrac data first remainFrame = 0;