aboutsummaryrefslogtreecommitdiff
path: root/engines/sword2
diff options
context:
space:
mode:
authorMax Horn2007-02-24 23:40:28 +0000
committerMax Horn2007-02-24 23:40:28 +0000
commitb3931a847d21b0770f7b30bd1e4c793dc283abf3 (patch)
tree07d97cf6a807d684f307fd81867f275e1ac89a42 /engines/sword2
parent65b30d84a805a7b22322474970a219d5628997d5 (diff)
downloadscummvm-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 'engines/sword2')
-rw-r--r--engines/sword2/music.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp
index 7ca7f685d3..dcb1fb9e75 100644
--- a/engines/sword2/music.cpp
+++ b/engines/sword2/music.cpp
@@ -53,14 +53,14 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base,
const char *ext;
int mode;
} file_types[] = {
- #ifdef USE_MAD
- { "cl3", kMP3Mode },
+ #ifdef USE_FLAC
+ { "clf", kFlacMode },
#endif
#ifdef USE_VORBIS
{ "clg", kVorbisMode },
#endif
- #ifdef USE_FLAC
- { "clf", kFlacMode },
+ #ifdef USE_MAD
+ { "cl3", kMP3Mode },
#endif
{ "clu", kCLUMode }
};