[Scummvm-cvs-logs] SF.net SVN: scummvm:[40843] scummvm/trunk/engines/kyra/sound.cpp

[lordhoto at users.sourceforge.net]

Revision: 40843
          http://scummvm.svn.sourceforge.net/scummvm/?rev=40843&view=rev
Author:   lordhoto
Date:     2009-05-24 00:11:28 +0000 (Sun, 24 May 2009)

Log Message:
-----------
- Reorder supported codecs list
- Add changes for upcoming audio compression changes (file extensions changed to standard ones)

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/sound.cpp

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2009-05-24 00:07:23 UTC (rev 40842)
+++ scummvm/trunk/engines/kyra/sound.cpp	2009-05-24 00:11:28 UTC (rev 40843)
@@ -252,19 +252,24 @@
 } // 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 }
 };
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.