[Scummvm-cvs-logs] CVS: scummvm/scumm/imuse_digi dimuse_sndmgr.cpp,1.63,1.64
Pawel Kolodziejski
aquadran at users.sourceforge.net
Fri Jan 28 09:30:01 CET 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 saga.vcproj,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.66,1.67 build_display.cpp,1.68,1.69 console.cpp,1.51,1.52 controls.cpp,1.82,1.83 events.cpp,1.34,1.35 function.cpp,1.74,1.75 icons.cpp,1.39,1.40 layers.cpp,1.33,1.34 logic.cpp,1.49,1.50 logic.h,1.40,1.41 mouse.cpp,1.64,1.65 resman.cpp,1.103,1.104 save_rest.cpp,1.64,1.65 scroll.cpp,1.21,1.22 sound.cpp,1.50,1.51 sound.h,1.11,1.12 speech.cpp,1.69,1.70 startup.cpp,1.46,1.47 sword2.cpp,1.132,1.133 sword2.h,1.74,1.75 sync.cpp,1.22,1.23 walker.cpp,1.43,1.44 startup.h,1.8,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm/imuse_digi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31172
Modified Files:
dimuse_sndmgr.cpp
Log Message:
more proper checks
Index: dimuse_sndmgr.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi/dimuse_sndmgr.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- dimuse_sndmgr.cpp 28 Jan 2005 14:55:52 -0000 1.63
+++ dimuse_sndmgr.cpp 28 Jan 2005 15:04:37 -0000 1.64
@@ -589,9 +589,9 @@
#ifdef USE_VORBIS
if (oggMode)
soundHandle->compressedStream = makeVorbisStream(cmpFile, len);
- else
#endif
#ifdef USE_MAD
+ if (!oggMode)
soundHandle->compressedStream = makeMP3Stream(cmpFile, len);
#endif
assert(soundHandle->compressedStream);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/dists/msvc8 saga.vcproj,1.4,1.5
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 anims.cpp,1.66,1.67 build_display.cpp,1.68,1.69 console.cpp,1.51,1.52 controls.cpp,1.82,1.83 events.cpp,1.34,1.35 function.cpp,1.74,1.75 icons.cpp,1.39,1.40 layers.cpp,1.33,1.34 logic.cpp,1.49,1.50 logic.h,1.40,1.41 mouse.cpp,1.64,1.65 resman.cpp,1.103,1.104 save_rest.cpp,1.64,1.65 scroll.cpp,1.21,1.22 sound.cpp,1.50,1.51 sound.h,1.11,1.12 speech.cpp,1.69,1.70 startup.cpp,1.46,1.47 sword2.cpp,1.132,1.133 sword2.h,1.74,1.75 sync.cpp,1.22,1.23 walker.cpp,1.43,1.44 startup.h,1.8,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list