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
---
 engines/sword2/music.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'engines/sword2')

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 }
 		};
-- 
cgit v1.2.3