[Scummvm-cvs-logs] SF.net SVN: scummvm:[49928] scummvm/trunk/engines/sci

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Thu Jun 17 14:29:59 CEST 2010


Revision: 49928
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49928&view=rev
Author:   thebluegr
Date:     2010-06-17 12:29:58 +0000 (Thu, 17 Jun 2010)

Log Message:
-----------
Fixed wPlayAudio, and added some documentation on the 3 new kDoAudio subops. Digital sounds in Pharkas work again

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

Modified: scummvm/trunk/engines/sci/engine/ksound.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/ksound.cpp	2010-06-17 12:13:27 UTC (rev 49927)
+++ scummvm/trunk/engines/sci/engine/ksound.cpp	2010-06-17 12:29:58 UTC (rev 49928)
@@ -174,9 +174,19 @@
 	case kSciAudioCD:
 		debugC(2, kDebugLevelSound, "kDoAudio: CD audio subop");
 		return kDoCdAudio(s, argc - 1, argv + 1);
-	// TODO: There are 3 more functions used in Freddy Pharkas (11, 12 and 13) and new within sierra sci
-	//			Details currently unknown
-	// kDoAudio sits at seg026:038C
+
+		// 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);
+		break;
+	case 12:
+		// Seems to be audio sync, used in Pharkas, silenced warning cause of the spam it produces
+		//warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), 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);
+		break;
 	default:
 		warning("kDoAudio: Unhandled case %d, %d extra arguments passed", argv[0].toUint16(), argc - 1);
 	}

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-06-17 12:13:27 UTC (rev 49927)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-06-17 12:29:58 UTC (rev 49928)
@@ -82,7 +82,7 @@
 	// sample length and return that. wPlayAudio should *not* actually start the sample.
 
 	int sampleLen = 0;
-	Audio::AudioStream *audioStream = getAudioStream(module, tuple, &sampleLen);
+	Audio::AudioStream *audioStream = getAudioStream(tuple, module, &sampleLen);
 	if (!audioStream)
 		warning("wPlayAudio: unable to create stream for audio tuple %d, module %d", tuple, module);
 	delete audioStream;


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