From b3931a847d21b0770f7b30bd1e4c793dc283abf3 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 24 Feb 2007 23:40:28 +0000 Subject: 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 --- sound/audiocd.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sound') 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 }; -- cgit v1.2.3