diff options
| author | Max Horn | 2007-02-24 23:40:28 +0000 |
|---|---|---|
| committer | Max Horn | 2007-02-24 23:40:28 +0000 |
| commit | b3931a847d21b0770f7b30bd1e4c793dc283abf3 (patch) | |
| tree | 07d97cf6a807d684f307fd81867f275e1ac89a42 /sound | |
| parent | 65b30d84a805a7b22322474970a219d5628997d5 (diff) | |
| download | scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.tar.gz scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.tar.bz2 scummvm-rg350-b3931a847d21b0770f7b30bd1e4c793dc283abf3.zip | |
Trying to unify the order in which we try the various audio formats: Prefer FLAC (lossless) over Ogg Vorbis ('free') over MP3 -- the order is admittedly somewhat arbitrary, but at least now it's consistent across all parts of ScummVM
svn-id: r25837
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/audiocd.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/audiocd.cpp b/sound/audiocd.cpp index 09713eaf0f..44fb35a5ef 100644 --- a/sound/audiocd.cpp +++ b/sound/audiocd.cpp @@ -49,15 +49,15 @@ struct TrackFormat { static const TrackFormat s_trackFormats[] = { /* decoderName, openTrackFunction */ +#ifdef USE_FLAC + { "Flac", getFlacTrack }, +#endif #ifdef USE_VORBIS { "Ogg Vorbis", getVorbisTrack }, #endif #ifdef USE_MAD { "MPEG Layer 3", getMP3Track }, #endif -#ifdef USE_FLAC - { "Flac", getFlacTrack }, -#endif { NULL, NULL } // Terminator }; |