[Scummvm-cvs-logs] scummvm master -> baafd74b660a65766ec7fa2b0c5215d884d0540b
lordhoto
lordhoto at gmail.com
Thu Jan 26 01:35:59 CET 2012
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
baafd74b66 AGOS: Fix silly copy&paste mistake, which broke Vorbis and MP3 support.
Commit: baafd74b660a65766ec7fa2b0c5215d884d0540b
https://github.com/scummvm/scummvm/commit/baafd74b660a65766ec7fa2b0c5215d884d0540b
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-25T16:35:06-08:00
Commit Message:
AGOS: Fix silly copy&paste mistake, which broke Vorbis and MP3 support.
Changed paths:
engines/agos/sound.cpp
diff --git a/engines/agos/sound.cpp b/engines/agos/sound.cpp
index a3cbbfd..85c449e 100644
--- a/engines/agos/sound.cpp
+++ b/engines/agos/sound.cpp
@@ -369,11 +369,11 @@ static BaseSound *makeSound(Audio::Mixer *mixer, const Common::String &basename)
#endif
#ifdef USE_VORBIS
if (Common::File::exists(basename + ".ogg"))
- return new FLACSound(mixer, basename + ".ogg");
+ return new VorbisSound(mixer, basename + ".ogg");
#endif
#ifdef USE_MAD
if (Common::File::exists(basename + ".mp3"))
- return new FLACSound(mixer, basename + ".mp3");
+ return new MP3Sound(mixer, basename + ".mp3");
#endif
if (Common::File::exists(basename + ".wav"))
return new WavSound(mixer, basename + ".wav");
More information about the Scummvm-git-logs
mailing list