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

thebluegr at users.sourceforge.net thebluegr at users.sourceforge.net
Sat Jan 2 14:04:36 CET 2010


Revision: 46880
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46880&view=rev
Author:   thebluegr
Date:     2010-01-02 13:04:36 +0000 (Sat, 02 Jan 2010)

Log Message:
-----------
SCI/new music code: Implemented cmdSetSoundHold. Larry now exits the limo normally in LSL5

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/midiparser.h
    scummvm/trunk/engines/sci/sfx/music.cpp
    scummvm/trunk/engines/sci/sfx/music.h
    scummvm/trunk/engines/sci/sfx/soundcmd.cpp

Modified: scummvm/trunk/engines/sci/sfx/midiparser.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/midiparser.h	2010-01-02 11:03:12 UTC (rev 46879)
+++ scummvm/trunk/engines/sci/sfx/midiparser.h	2010-01-02 13:04:36 UTC (rev 46880)
@@ -63,6 +63,12 @@
 		allNotesOff();
 	}
 
+	void hangAllnotes(byte value) {
+		if (value)
+			hangAllActiveNotes();
+		else
+			allNotesOff();
+	}
 protected:
 	void parseNextEvent(EventInfo &info);
 	byte *midiMixChannels();

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-02 11:03:12 UTC (rev 46879)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-02 13:04:36 UTC (rev 46880)
@@ -433,6 +433,13 @@
 	sortPlayList();
 }
 
+void SciMusic::soundSetHold(MusicEntry *pSnd, byte hold) {
+	Common::StackLock lock(_mutex);
+
+	pSnd->hold = hold;
+	pSnd->pMidiParser->hangAllnotes(hold);
+}
+
 void SciMusic::soundKill(MusicEntry *pSnd) {
 	pSnd->status = kSoundStopped;
 

Modified: scummvm/trunk/engines/sci/sfx/music.h
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.h	2010-01-02 11:03:12 UTC (rev 46879)
+++ scummvm/trunk/engines/sci/sfx/music.h	2010-01-02 13:04:36 UTC (rev 46880)
@@ -146,6 +146,7 @@
 	void soundResume(MusicEntry *pSnd);
 	void soundSetVolume(MusicEntry *pSnd, byte volume);
 	void soundSetPriority(MusicEntry *pSnd, byte prio);
+	void soundSetHold(MusicEntry *pSnd, byte hold);
 	uint16 soundGetMasterVolume();
 	void soundSetMasterVolume(uint16 vol);
 	uint16 soundGetSoundOn() const { return _soundOn; }

Modified: scummvm/trunk/engines/sci/sfx/soundcmd.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 11:03:12 UTC (rev 46879)
+++ scummvm/trunk/engines/sci/sfx/soundcmd.cpp	2010-01-02 13:04:36 UTC (rev 46880)
@@ -857,9 +857,12 @@
 		return;
 	}
 
-	musicSlot->hold = value;
-
-	// TODO: actually handle channel hold!
+	// Hold the sound before it ends for the specified amount of time. The
+	// engine will signal when to stop it, by setting hold to 0, in which
+	// case stop the sound
+	_music->soundSetHold(musicSlot, value);
+	if (!value)
+		cmdStopSound(obj, 0);
 #endif
 }
 


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