[Scummvm-cvs-logs] CVS: scummvm/simon sound.cpp,1.88,1.89
Jonathan Gray
khalek at users.sourceforge.net
Tue Aug 9 23:17:55 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.22,1.23 audiostream.cpp,1.75,1.76 vorbis.cpp,1.27,1.28 vorbis.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.40,1.41 music.cpp,1.46,1.47 sound.cpp,1.47,1.48 sword1.cpp,1.90,1.91
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/simon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/simon
Modified Files:
sound.cpp
Log Message:
Rest of the changes required for tremor to actually work.
Based on patches against 0.7.1 by Jolan Luff.
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/simon/sound.cpp,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -d -r1.88 -r1.89
--- sound.cpp 30 Jul 2005 21:11:35 -0000 1.88
+++ sound.cpp 10 Aug 2005 06:16:25 -0000 1.89
@@ -183,7 +183,7 @@
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
class VorbisSound : public BaseSound {
public:
VorbisSound(Audio::Mixer *mixer, File *file, uint32 base = 0) : BaseSound(mixer, file, base) {};
@@ -271,7 +271,7 @@
}
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
if (!_voice && gss->vorbis_filename && gss->vorbis_filename[0]) {
file->open(gss->vorbis_filename);
if (file->isOpen()) {
@@ -323,7 +323,7 @@
}
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
if (!_effects && gss->vorbis_effects_filename && gss->vorbis_effects_filename[0]) {
file->open(gss->vorbis_effects_filename);
if (file->isOpen()) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.22,1.23 audiostream.cpp,1.75,1.76 vorbis.cpp,1.27,1.28 vorbis.h,1.11,1.12
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword1 animation.cpp,1.40,1.41 music.cpp,1.46,1.47 sound.cpp,1.47,1.48 sword1.cpp,1.90,1.91
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list