[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.27,1.28
Max Horn
fingolfin at users.sourceforge.net
Tue Jun 24 14:53:25 CEST 2003
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1:/tmp/cvs-serv17981
Modified Files:
sound.cpp
Log Message:
only declare class MP3Sound if USE_MAD is #defined
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- sound.cpp 21 Jun 2003 22:04:20 -0000 1.27
+++ sound.cpp 24 Jun 2003 21:52:52 -0000 1.28
@@ -48,12 +48,6 @@
int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
};
-class MP3Sound : public BaseSound {
-public:
- MP3Sound(SoundMixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
- int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
-};
-
BaseSound::BaseSound(SoundMixer *mixer, File *file, uint32 base) {
_mixer = mixer;
_file = file;
@@ -208,6 +202,12 @@
}
#ifdef USE_MAD
+class MP3Sound : public BaseSound {
+public:
+ MP3Sound(SoundMixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
+ int playSound(uint sound, PlayingSoundHandle *handle, byte flags = 0);
+};
+
int MP3Sound::playSound(uint sound, PlayingSoundHandle *handle, byte flags)
{
if (_offsets == NULL)
More information about the Scummvm-git-logs
mailing list