[Scummvm-cvs-logs] SF.net SVN: scummvm:[55882] scummvm/trunk/video

[mthreepwood at users.sourceforge.net]

Revision: 55882
          http://scummvm.svn.sourceforge.net/scummvm/?rev=55882&view=rev
Author:   mthreepwood
Date:     2011-02-11 15:02:15 +0000 (Fri, 11 Feb 2011)

Log Message:
-----------
VIDEO: Fix QDM2 audio

A regression from r55474

Modified Paths:
--------------
    scummvm/trunk/video/codecs/qdm2.cpp
    scummvm/trunk/video/qt_decoder.cpp

Modified: scummvm/trunk/video/codecs/qdm2.cpp
===================================================================
--- scummvm/trunk/video/codecs/qdm2.cpp	2011-02-11 07:42:35 UTC (rev 55881)
+++ scummvm/trunk/video/codecs/qdm2.cpp	2011-02-11 15:02:15 UTC (rev 55882)
@@ -28,7 +28,7 @@
 #include "common/scummsys.h"
 #include "video/codecs/qdm2.h"
 
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 
 #include "audio/audiostream.h"
 #include "video/codecs/qdm2data.h"

Modified: scummvm/trunk/video/qt_decoder.cpp
===================================================================
--- scummvm/trunk/video/qt_decoder.cpp	2011-02-11 07:42:35 UTC (rev 55881)
+++ scummvm/trunk/video/qt_decoder.cpp	2011-02-11 15:02:15 UTC (rev 55882)
@@ -1315,7 +1315,7 @@
 	if (tag == MKID_BE('twos') || tag == MKID_BE('raw ') || tag == MKID_BE('ima4'))
 		return true;
 
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 	if (tag == MKID_BE('QDM2'))
 		return true;
 #endif
@@ -1348,7 +1348,7 @@
 	} else if (entry->codecTag == MKID_BE('ima4')) {
 		// Riven uses this codec (as do some Myst ME videos)
 		return Audio::makeADPCMStream(stream, DisposeAfterUse::YES, stream->size(), Audio::kADPCMApple, entry->sampleRate, entry->channels, 34);
-#ifdef GRAPHICS_QDM2_H
+#ifdef VIDEO_CODECS_QDM2_H
 	} else if (entry->codecTag == MKID_BE('QDM2')) {
 		// Several Myst ME videos use this codec
 		return makeQDM2Stream(stream, _streams[_audioStreamIndex]->extradata);


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