* Fix PSP compilation.
This commit is contained in:
jean.chalard
2009-01-04 08:19:36 +00:00
parent e69f5f3363
commit a85b6f69e8
2 changed files with 229 additions and 229 deletions
+1 -1
View File
@@ -15,7 +15,7 @@ GENERIC_OBJS = src/JApp.o src/JGBKFont.o \
src/tinyxml/tinyxmlparser.o src/tinyxml/tinyxmlerror.o \ src/tinyxml/tinyxmlparser.o src/tinyxml/tinyxmlerror.o \
src/Encoding.o src/JTTFont.o \ src/Encoding.o src/JTTFont.o \
src/JMD2Model.o src/JOBJModel.o src/vram.o src/JMD2Model.o src/JOBJModel.o src/vram.o
PSP_OBJS = src/JGfx.o src/JSfx.o src/main.o PSP_OBJS = src/JGfx.o src/JSfx.o src/JAudio.o src/JMP3.o src/decoder_prx.o src/main.o
LINUX_OBJS = src/linux/JGfx.o src/linux/JSfx.o src/Xmain.o LINUX_OBJS = src/linux/JGfx.o src/linux/JSfx.o src/Xmain.o
+2 -2
View File
@@ -19,7 +19,7 @@ void JMP3::init() {
} }
JMP3::JMP3(const std::string& filename, int inBufferSize, int outBufferSize) : JMP3::JMP3(const std::string& filename, int inBufferSize, int outBufferSize) :
m_volume(PSP_AUDIO_VOLUME_MAX), m_paused(true), m_samplesPlayed(0) { m_volume(PSP_AUDIO_VOLUME_MAX), m_samplesPlayed(0), m_paused(true) {
load(filename, inBufferSize,outBufferSize); load(filename, inBufferSize,outBufferSize);
} }
@@ -180,7 +180,7 @@ bool JMP3::update() {
} }
// Okay, let's see if we can't get something outputted :/ // Okay, let's see if we can't get something outputted :/
if (numDecoded == 0 || numDecoded == 0x80671402) { if (numDecoded == 0 || ((unsigned)numDecoded == 0x80671402)) {
sceMp3ResetPlayPosition(m_mp3Handle); sceMp3ResetPlayPosition(m_mp3Handle);
if (!m_loop) if (!m_loop)
m_paused = true; m_paused = true;