[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.57,1.58 sound.h,1.30,1.31
Jonathan Gray
khalek at users.sourceforge.net
Tue Aug 9 23:17:42 CEST 2005
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19296/queen
Modified Files:
sound.cpp sound.h
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/queen/sound.cpp,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sound.cpp 30 Jul 2005 21:11:20 -0000 1.57
+++ sound.cpp 10 Aug 2005 06:16:25 -0000 1.58
@@ -60,7 +60,7 @@
#endif
break;
case COMPRESSION_OGG:
-#ifndef USE_VORBIS
+#if !defined(USE_VORBIS) && !defined(USE_TREMOR)
warning("Using OGG compressed datafile, but OGG support not compiled in");
return new SilentSound(mixer, vm);
#else
@@ -205,7 +205,7 @@
}
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
void OGGSound::sfxPlay(const char *name, bool isSpeech) {
uint32 size;
Common::File *f = _vm->resource()->giveCompressedSound(name, &size);
Index: sound.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sound.h 30 Jul 2005 21:11:20 -0000 1.30
+++ sound.h 10 Aug 2005 06:16:25 -0000 1.31
@@ -138,7 +138,7 @@
};
#endif
-#ifdef USE_VORBIS
+#if defined(USE_VORBIS) || defined(USE_TREMOR)
class OGGSound : public Sound {
public:
OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};
More information about the Scummvm-git-logs
mailing list