[Scummvm-cvs-logs] CVS: scummvm/sword2/driver animation.cpp,1.23,1.24
Max Horn
fingolfin at users.sourceforge.net
Sun Feb 22 06:25:03 CET 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummvm README,1.256,1.257 configure,1.72,1.73
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound flac.cpp,NONE,1.1 flac.h,NONE,1.1 module.mk,1.16,1.17 audiocd.cpp,1.10,1.11 audiostream.cpp,1.55,1.56 mixer.cpp,1.157,1.158 mp3.cpp,1.8,1.9 vorbis.cpp,1.11,1.12 audiostream.h,1.31,1.32 mixer.h,1.75,1.76 mp3.h,1.7,1.8 vorbis.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/sword2/driver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv387/sword2/driver
Modified Files:
animation.cpp
Log Message:
Patch #885904 (Flac Support) with some tweaks by me
Index: animation.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sword2/driver/animation.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- animation.cpp 21 Feb 2004 20:00:51 -0000 1.23
+++ animation.cpp 22 Feb 2004 14:11:12 -0000 1.24
@@ -145,24 +145,14 @@
ticks = _vm->_system->get_msecs();
// Play audio
- sndfile = new File;
-
-#ifdef USE_VORBIS
- sprintf(tempFile, "%s.ogg", name);
- if (sndfile->open(tempFile))
- bgSoundStream = makeVorbisStream(sndfile, sndfile->size());
-#endif
+ sndfile = new File();
+ bgSoundStream = AudioStream::openStreamFile( name, sndfile );
-#ifdef USE_MAD
- if (!sndfile->isOpen()) {
- sprintf(tempFile, "%s.mp3", name);
- if (sndfile->open(tempFile))
- bgSoundStream = makeMP3Stream(sndfile, sndfile->size());
+ if (bgSoundStream != NULL) {
+ _vm->_mixer->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);
+ } else {
+ warning("Cutscene: Could not open Audio Track for %s", name);
}
-#endif
-
- if (sndfile->isOpen())
- _vm->_mixer->playInputStream(&bgSound, bgSoundStream, false, 255, 0, -1, false);
return true;
#else /* USE_MPEG2 */
- Previous message: [Scummvm-cvs-logs] CVS: scummvm README,1.256,1.257 configure,1.72,1.73
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sound flac.cpp,NONE,1.1 flac.h,NONE,1.1 module.mk,1.16,1.17 audiocd.cpp,1.10,1.11 audiostream.cpp,1.55,1.56 mixer.cpp,1.157,1.158 mp3.cpp,1.8,1.9 vorbis.cpp,1.11,1.12 audiostream.h,1.31,1.32 mixer.h,1.75,1.76 mp3.h,1.7,1.8 vorbis.h,1.7,1.8
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list