[Scummvm-cvs-logs] SF.net SVN: scummvm:[46702] tools/branches/gsoc2009-gui/compress.cpp

[sev at users.sourceforge.net]

Revision: 46702
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46702&view=rev
Author:   sev
Date:     2009-12-29 08:44:59 +0000 (Tue, 29 Dec 2009)

Log Message:
-----------
Switched from DISABLE_BUILTIN_FLAC|VORBIS to USE_* generated by configure

Modified Paths:
--------------
    tools/branches/gsoc2009-gui/compress.cpp

Modified: tools/branches/gsoc2009-gui/compress.cpp
===================================================================
--- tools/branches/gsoc2009-gui/compress.cpp	2009-12-29 02:21:04 UTC (rev 46701)
+++ tools/branches/gsoc2009-gui/compress.cpp	2009-12-29 08:44:59 UTC (rev 46702)
@@ -27,10 +27,10 @@
 
 #include "compress.h"
 
-#ifndef DISABLE_BUILTIN_VORBIS
+#ifdef USE_VORBIS
 #include <vorbis/vorbisenc.h>
 #endif
-#ifndef DISABLE_BUILTIN_FLAC
+#ifdef USE_FLAC
 #define FLAC__NO_DLL 1
 #include <FLAC/stream_encoder.h>
 #endif
@@ -168,7 +168,7 @@
 		}
 	}
 
-#ifdef DISABLE_BUILTIN_VORBIS
+#ifndef USE_VORBIS
 	if (compmode == AUDIO_VORBIS) {
 		tmp += sprintf(tmp, "oggenc ");
 		if (rawInput) {
@@ -212,7 +212,7 @@
 	}
 #endif
 
-#ifdef DISABLE_BUILTIN_FLAC
+#ifndef USE_FLAC
 	if (compmode == AUDIO_FLAC) {
 		/* --lax is needed to allow 11kHz, we dont need place for meta-tags, and no seektable */
 		/* -f is reqired to force override of unremoved temp file. See bug #1294648 */
@@ -298,7 +298,7 @@
 
 	print(" - len=%ld, ch=%d, rate=%d, %dbits\n", length, (rawAudioType.isStereo ? 2 : 1), samplerate, rawAudioType.bitsPerSample);
 
-#ifndef DISABLE_BUILTIN_VORBIS
+#ifdef USE_VORBIS
 	if (compmode == AUDIO_VORBIS) {
 		char outputString[256] = "";
 		int numChannels = (rawAudioType.isStereo ? 2 : 1);
@@ -503,7 +503,7 @@
 	}
 #endif
 
-#ifndef DISABLE_BUILTIN_FLAC
+#ifdef USE_FLAC
 	if (compmode == AUDIO_FLAC) {
 		int i;
 		int numChannels = (rawAudioType.isStereo ? 2 : 1);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.