[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.23,1.24 audiostream.cpp,1.76,1.77 vorbis.cpp,1.28,1.29 vorbis.h,1.12,1.13

[Jonathan Gray]

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

Modified Files:
	audiocd.cpp audiostream.cpp vorbis.cpp vorbis.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: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- audiocd.cpp	10 Aug 2005 06:16:25 -0000	1.23
+++ audiocd.cpp	10 Aug 2005 12:42:56 -0000	1.24
@@ -47,7 +47,7 @@
 #ifdef USE_FLAC
 	{ "Flac",			getFlacTrack },
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	{ "Ogg Vorbis",		getVorbisTrack },
 #endif
 #ifdef USE_MAD

Index: audiostream.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiostream.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -d -r1.76 -r1.77
--- audiostream.cpp	10 Aug 2005 06:16:25 -0000	1.76
+++ audiostream.cpp	10 Aug 2005 12:42:56 -0000	1.77
@@ -45,7 +45,7 @@
 	{ "Flac",			"flac", makeFlacStream },
 	{ "Flac",			"fla",  makeFlacStream },
 #endif
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 	{ "Ogg Vorbis",		"ogg",  makeVorbisStream },
 #endif
 #ifdef USE_MAD

Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- vorbis.cpp	10 Aug 2005 06:16:25 -0000	1.28
+++ vorbis.cpp	10 Aug 2005 12:42:56 -0000	1.29
@@ -21,7 +21,7 @@
 
 #include "sound/vorbis.h"
 
-#if defined(USE_TREMOR) || defined(USE_VORBIS)
+#ifdef USE_VORBIS
 
 #include "common/file.h"
 #include "common/util.h"

Index: vorbis.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vorbis.h	10 Aug 2005 06:16:25 -0000	1.12
+++ vorbis.h	10 Aug 2005 12:42:56 -0000	1.13
@@ -25,7 +25,7 @@
 #include "common/stdafx.h"
 #include "common/scummsys.h"
 
-#if defined(USE_VORBIS) || defined(USE_TREMOR)
+#ifdef USE_VORBIS
 
 class AudioStream;
 class DigitalTrackInfo;