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 /sound | |
| 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 'sound')
| -rw-r--r-- | sound/audiocd.cpp | 2 | ||||
| -rw-r--r-- | sound/audiostream.cpp | 2 | ||||
| -rw-r--r-- | sound/vorbis.cpp | 2 | ||||
| -rw-r--r-- | sound/vorbis.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index dee17a0910..a08937a713 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -47,7 +47,7 @@ static const TrackFormat TRACK_FORMATS[] = { #ifdef USE_FLAC { "Flac", getFlacTrack }, #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS { "Ogg Vorbis", getVorbisTrack }, #endif #ifdef USE_MAD diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index 776322d0fe..019f088b9b 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -45,7 +45,7 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = { { "Flac", "flac", makeFlacStream }, { "Flac", "fla", makeFlacStream }, #endif -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS { "Ogg Vorbis", "ogg", makeVorbisStream }, #endif #ifdef USE_MAD diff --git a/sound/vorbis.cpp b/sound/vorbis.cpp index 669293a90f..99170102cb 100644 --- a/sound/vorbis.cpp +++ b/sound/vorbis.cpp @@ -21,7 +21,7 @@ #include "sound/vorbis.h" -#if defined(USE_TREMOR) || defined(USE_VORBIS) +#ifdef USE_VORBIS #include "common/file.h" #include "common/util.h" diff --git a/sound/vorbis.h b/sound/vorbis.h index fe8da6881f..6f3796afff 100644 --- a/sound/vorbis.h +++ b/sound/vorbis.h @@ -25,7 +25,7 @@ #include "common/stdafx.h" #include "common/scummsys.h" -#if defined(USE_VORBIS) || defined(USE_TREMOR) +#ifdef USE_VORBIS class AudioStream; class DigitalTrackInfo; |