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 /engines/kyra | |
| 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 'engines/kyra')
| -rw-r--r-- | engines/kyra/sound.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index af5aa5de1f..9463e1e933 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -551,15 +551,15 @@ bool KyraEngine::snd_voiceIsPlaying() { // static res const Sound::SpeechCodecs Sound::_supportedCodes[] = { -#ifdef USE_MAD - { ".VO3", Audio::makeMP3Stream }, -#endif // USE_MAD -#ifdef USE_VORBIS - { ".VOG", Audio::makeVorbisStream }, -#endif // USE_VORBIS #ifdef USE_FLAC { ".VOF", Audio::makeFlacStream }, #endif // USE_FLAC +#ifdef USE_VORBIS + { ".VOG", Audio::makeVorbisStream }, +#endif // USE_VORBIS +#ifdef USE_MAD + { ".VO3", Audio::makeMP3Stream }, +#endif // USE_MAD { 0, 0 } }; |