[Scummvm-cvs-logs] SF.net SVN: scummvm:[50134] scummvm/trunk/engines/sci/engine/ksound.cpp
mthreepwood at users.sourceforge.net
mthreepwood at users.sourceforge.net
Tue Jun 22 00:58:33 CEST 2010
Revision: 50134
http://scummvm.svn.sourceforge.net/scummvm/?rev=50134&view=rev
Author: mthreepwood
Date: 2010-06-21 22:58:33 +0000 (Mon, 21 Jun 2010)
Log Message:
-----------
In SCI32, kDoAudio subop 10 is no longer CD audio. Just stub it off for now.
Modified Paths:
--------------
scummvm/trunk/engines/sci/engine/ksound.cpp
Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp 2010-06-21 22:49:17 UTC (rev 50133)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp 2010-06-21 22:58:33 UTC (rev 50134)
@@ -174,21 +174,30 @@
}
break;
case kSciAudioCD:
- debugC(2, kDebugLevelSound, "kDoAudio: CD audio subop");
- return kDoCdAudio(s, argc - 1, argv + 1);
+ if (getSciVersion() <= SCI_VERSION_1_1) {
+ debugC(2, kDebugLevelSound, "kDoAudio: CD audio subop");
+ return kDoCdAudio(s, argc - 1, argv + 1);
+#ifdef ENABLE_SCI32
+ } else {
+ // TODO: This isn't CD Audio in SCI32 anymore
+ warning("kDoAudio: Unhandled case 10, %d extra arguments passed", argc - 1);
+ break;
+#endif
+ }
+
// 3 new subops in Pharkas. kDoAudio in Pharkas sits at seg026:038C
case 11:
- warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
+ warning("kDoAudio: Unhandled case 11, %d extra arguments passed", argc - 1);
break;
case 12:
// Seems to be audio sync, used in Pharkas. Silenced the warning due to
// the high level of spam it produces.
- //warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
+ //warning("kDoAudio: Unhandled case 12, %d extra arguments passed", argc - 1);
break;
case 13:
// Used in Pharkas whenever a speech sample starts
- warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
+ warning("kDoAudio: Unhandled case 13, %d extra arguments passed", argc - 1);
break;
default:
warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list