[Scummvm-cvs-logs] CVS: scummvm/queen sound.cpp,1.58,1.59 sound.h,1.31,1.32

Jonathan Gray khalek at users.sourceforge.net
Wed Aug 10 05:45:04 CEST 2005


Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26483/queen

Modified Files:
	sound.cpp sound.h 
Log Message:
Don't explicity check for tremor and vorbis everywhere and
require both USE_TREMOR and USE_VORBIS to be defined when
using tremor.


Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/sound.cpp,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- sound.cpp	10 Aug 2005 06:16:25 -0000	1.58
+++ sound.cpp	10 Aug 2005 12:42:56 -0000	1.59
@@ -60,7 +60,7 @@
 #endif
 		break;
 	case COMPRESSION_OGG:
-#if !defined(USE_VORBIS) && !defined(USE_TREMOR)
+#ifndef USE_VORBIS
 		warning("Using OGG compressed datafile, but OGG support not compiled in");
 		return new SilentSound(mixer, vm);
 #else
@@ -205,7 +205,7 @@
 }
 #endif
 
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 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.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- sound.h	10 Aug 2005 06:16:25 -0000	1.31
+++ sound.h	10 Aug 2005 12:42:56 -0000	1.32
@@ -138,7 +138,7 @@
 };
 #endif
 
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 class OGGSound : public Sound {
 public:
 	OGGSound(Audio::Mixer *mixer, QueenEngine *vm) : Sound(mixer, vm) {};





More information about the Scummvm-git-logs mailing list