[Scummvm-cvs-logs] SF.net SVN: scummvm:[49351] scummvm/trunk/engines/sci/sound/audio.cpp

[thebluegr at users.sourceforge.net]

Revision: 49351
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49351&view=rev
Author:   thebluegr
Date:     2010-05-31 12:36:42 +0000 (Mon, 31 May 2010)

Log Message:
-----------
SCI: Silenced warning when no audio decoder is compiled in

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sound/audio.cpp

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-05-31 12:27:13 UTC (rev 49350)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-05-31 12:36:42 UTC (rev 49351)
@@ -235,6 +235,7 @@
 	uint32 audioCompressionType = audioRes->getAudioCompressionType();
 
 	if (audioCompressionType) {
+#if (defined(USE_MAD) || defined(USE_VORBIS) || defined(USE_FLAC))
 		// Compressed audio made by our tool
 		byte *compressedData = (byte *)malloc(audioRes->size);
 		assert(compressedData);
@@ -261,6 +262,9 @@
 #endif
 			break;
 		}
+#else
+		error("Compressed audio file encountered, but no appropriate decoder is compiled in");
+#endif
 	} else {
 		// Original source file
 		if (audioRes->_headerSize > 0) {


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