[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.19,1.20
Nicolas Bacca
arisme at users.sourceforge.net
Thu Feb 12 17:01:14 CET 2004
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25423/sword2/driver
Modified Files:
animation.cpp
Log Message:
Check for MP3 file in Broken Sword cutscenes - useful for WinCE backend as Tremor crashes for no specific reason (help appreciated :p) here
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- animation.cpp 12 Feb 2004 16:55:18 -0000 1.19
+++ animation.cpp 13 Feb 2004 00:54:58 -0000 1.20
@@ -31,6 +31,7 @@
#include "common/file.h"
#include "sound/vorbis.h"
+#include "sound/mp3.h"
namespace Sword2 {
@@ -136,19 +137,25 @@
ticks = _vm->_system->get_msecs();
// Play audio
+ sndfile = new File;
#ifdef USE_VORBIS
- // TODO: There is no reason that this only allows OGG, and not MP3, or
- // any other format the mixer might support one day... is there?
- sndfile = new File;
sprintf(tempFile, "%s.ogg", name);
- if (sndfile->open(tempFile)) {
- bgSoundStream = makeVorbisStream(sndfile, sndfile->size());
- _vm->_mixer->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);
- }
+ if (sndfile->open(tempFile))
+ bgSoundStream = makeVorbisStream(sndfile, sndfile->size());
+#endif
+#ifdef USE_MAD
+ if (!sndfile->isOpen()) {
+ sprintf(tempFile, "%s.mp3", name);
+ if (sndfile->open(tempFile))
+ bgSoundStream = makeMP3Stream(sndfile, sndfile->size());
+ }
#endif
+ if (sndfile->isOpen())
+ _vm->_mixer->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);
+
return true;
#else /* USE_MPEG2 */
return false;
More information about the Scummvm-git-logs
mailing list