diff options
| author | Johannes Schickel | 2009-05-24 00:11:28 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2009-05-24 00:11:28 +0000 |
| commit | ad4549f28d4ebc5668c0e917a37a3b34473acc84 (patch) | |
| tree | b077636868d2bf6b3a5d3bb4e6081af39d3f07ee | |
| parent | 8989e140c7407706703c9a53973357a2e59b9426 (diff) | |
| download | scummvm-rg350-ad4549f28d4ebc5668c0e917a37a3b34473acc84.tar.gz scummvm-rg350-ad4549f28d4ebc5668c0e917a37a3b34473acc84.tar.bz2 scummvm-rg350-ad4549f28d4ebc5668c0e917a37a3b34473acc84.zip | |
- Reorder supported codecs list
- Add changes for upcoming audio compression changes (file extensions changed to standard ones)
svn-id: r40843
| -rw-r--r-- | engines/kyra/sound.cpp | 21 |
1 files changed, 13 insertions, 8 deletions
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 } }; |