diff options
author | Max Horn | 2003-06-24 21:52:52 +0000 |
---|---|---|
committer | Max Horn | 2003-06-24 21:52:52 +0000 |
commit | 6ca8d634fd636f65ac3aab3775d78391c4c4923e (patch) | |
tree | ed8d17e7058d6b6b249d222d323d8cf791280da8 /simon | |
parent | 22e979de216c99d72892c9b33177fdd639e38547 (diff) | |
download | scummvm-rg350-6ca8d634fd636f65ac3aab3775d78391c4c4923e.tar.gz scummvm-rg350-6ca8d634fd636f65ac3aab3775d78391c4c4923e.tar.bz2 scummvm-rg350-6ca8d634fd636f65ac3aab3775d78391c4c4923e.zip |
only declare class MP3Sound if USE_MAD is #defined
svn-id: r8644
Diffstat (limited to 'simon')
-rw-r--r-- | simon/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/simon/sound.cpp b/simon/sound.cpp index 08c2aa876b..61b22b5cd3 100644 --- a/simon/sound.cpp +++ b/simon/sound.cpp @@ -48,12 +48,6 @@ public: 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 @@ int VocSound::playSound(uint sound, PlayingSoundHandle *handle, byte flags) { } #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) |