[Scummvm-cvs-logs] CVS: scummvm/sound vorbis.cpp,1.25,1.26

Jonathan Gray khalek at users.sourceforge.net
Thu Jun 30 02:16:01 CEST 2005


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

Modified Files:
	vorbis.cpp 
Log Message:
Enhanced tremor support from Jolan Luff.
The configure script now works as follows for detection:
Tremor only: use tremor
Vorbis only: use vorbis
Both: use vorbis

This behaviour can be changed with newly added configure script options.


Index: vorbis.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/vorbis.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- vorbis.cpp	11 May 2005 00:01:36 -0000	1.25
+++ vorbis.cpp	30 Jun 2005 09:14:36 -0000	1.26
@@ -21,7 +21,7 @@
 
 #include "sound/vorbis.h"
 
-#ifdef USE_VORBIS
+#if defined(USE_TREMOR) || defined(USE_VORBIS)
 
 #include "common/file.h"
 #include "common/util.h"
@@ -29,7 +29,11 @@
 #include "sound/audiostream.h"
 #include "sound/audiocd.h"
 
+#ifdef USE_TREMOR
+#include <tremor/ivorbisfile.h>
+#else
 #include <vorbis/vorbisfile.h>
+#endif
 
 
 using Common::File;





More information about the Scummvm-git-logs mailing list