From ad4549f28d4ebc5668c0e917a37a3b34473acc84 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 24 May 2009 00:11:28 +0000 Subject: - Reorder supported codecs list - Add changes for upcoming audio compression changes (file extensions changed to standard ones) svn-id: r40843 --- engines/kyra/sound.cpp | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'engines/kyra/sound.cpp') diff --git a/engines/kyra/sound.cpp b/engines/kyra/sound.cpp index 00aba95d0a..cd86d388d8 100644 --- a/engines/kyra/sound.cpp +++ b/engines/kyra/sound.cpp @@ -252,18 +252,23 @@ Audio::AudioStream *makeVOCStream(Common::SeekableReadStream *stream, bool dispo } // end of anonymous namespace const Sound::SpeechCodecs Sound::_supportedCodecs[] = { -#ifdef USE_FLAC - { ".VOF", Audio::makeFlacStream }, -#endif // USE_FLAC -#ifdef USE_VORBIS - { ".VOG", Audio::makeVorbisStream }, -#endif // USE_VORBIS + { ".VOC", makeVOCStream }, + { "", makeVOCStream }, + #ifdef USE_MAD { ".VO3", Audio::makeMP3Stream }, + { ".MP3", Audio::makeMP3Stream }, #endif // USE_MAD - { ".VOC", makeVOCStream }, - { "", makeVOCStream }, +#ifdef USE_VORBIS + { ".VOG", Audio::makeVorbisStream }, + { ".OGG", Audio::makeVorbisStream }, +#endif // USE_VORBIS + +#ifdef USE_FLAC + { ".VOF", Audio::makeFlacStream }, + { ".FLA", Audio::makeFlacStream }, +#endif // USE_FLAC { 0, 0 } }; -- cgit v1.2.3