[Scummvm-cvs-logs] CVS: scummvm/scumm/smush smush_player.cpp,1.174,1.175

[Jonathan Gray]

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

Modified Files:
	smush_player.cpp 
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: smush_player.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/smush/smush_player.cpp,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- smush_player.cpp	10 Aug 2005 06:16:25 -0000	1.174
+++ smush_player.cpp	10 Aug 2005 12:42:56 -0000	1.175
@@ -1199,7 +1199,7 @@
 	if (i == NULL) {
 		error("invalid filename : %s", filename);
 	}
-#if defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_TREMOR)
+#if defined(USE_MAD) || defined(USE_VORBIS)
 	char fname[260];
 #endif
 #ifdef USE_MAD
@@ -1213,7 +1213,7 @@
 		return;
 	}
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	memcpy(fname, filename, i - filename);
 	strcpy(fname + (i - filename), ".ogg");
 	_compressedFile.open(fname);