[Scummvm-cvs-logs] SF.net SVN: scummvm: [28673] scummvm/trunk/engines/agi/sound.cpp

buddha_ at users.sourceforge.net buddha_ at users.sourceforge.net
Mon Aug 20 01:33:22 CEST 2007


Revision: 28673
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28673&view=rev
Author:   buddha_
Date:     2007-08-19 16:33:22 -0700 (Sun, 19 Aug 2007)

Log Message:
-----------
Removed superfluous variable checkings. Made it so that Apple IIGS mixing code doesn't try to mix MIDI sounds yet as mixing them isn't yet supported.

Modified Paths:
--------------
    scummvm/trunk/engines/agi/sound.cpp

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2007-08-19 23:28:38 UTC (rev 28672)
+++ scummvm/trunk/engines/agi/sound.cpp	2007-08-19 23:33:22 UTC (rev 28673)
@@ -667,7 +667,11 @@
 		return BUFFER_SIZE;
 
 	// Handle Apple IIGS sound mixing here
-	if (_vm->_soundemu == SOUND_EMU_APPLE2GS && _playing && _playingSound != -1) {
+	if (_vm->_soundemu == SOUND_EMU_APPLE2GS) {
+		AgiSoundType type = (AgiSoundType) _vm->_game.sounds[_playingSound]->type();
+		// Currently we only support mixing a single sample in Apple IIGS mixing code.
+		if (type != AGI_SOUND_SAMPLE)
+			return IIGS_BUFFER_SIZE;
 		//IIgsWaveInfo &waveInfo = _IIgsChannel.ins.oscList(0).waves[0];
 
 		//uint period = noteToPeriod(fracToInt(_IIgsChannel.note + FRAC_HALF));


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