diff options
| author | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2005-08-10 12:42:56 +0000 |
| commit | 603a5e4d6f7403d3d797ead4b4cc909ab55c34d1 (patch) | |
| tree | 7d2419b901c71a0e6c823d4a7b07abebaf610dd7 /sword2 | |
| parent | 3c1b5648aed0be45b303cea49e7537c98dd4a001 (diff) | |
| download | scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.gz scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.tar.bz2 scummvm-rg350-603a5e4d6f7403d3d797ead4b4cc909ab55c34d1.zip | |
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.
svn-id: r18642
Diffstat (limited to 'sword2')
| -rw-r--r-- | sword2/driver/d_sound.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sword2/driver/d_sound.cpp b/sword2/driver/d_sound.cpp index 3b408417f1..f24646a9af 100644 --- a/sword2/driver/d_sound.cpp +++ b/sword2/driver/d_sound.cpp @@ -51,7 +51,7 @@ static AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd #ifdef USE_MAD { "cl3", kMP3Mode }, #endif - #if defined(USE_VORBIS) || defined(USE_TREMOR) + #ifdef USE_VORBIS { "clg", kVorbisMode }, #endif #ifdef USE_FLAC @@ -135,7 +135,7 @@ static AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, int cd case kMP3Mode: return makeMP3Stream(fh->file, enc_len); #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS case kVorbisMode: return makeVorbisStream(fh->file, enc_len); #endif |