[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.11,1.12 palm.h,1.9,1.10

Chris Apers chrilith at users.sourceforge.net
Mon Jun 9 02:49:10 CEST 2003


Update of /cvsroot/scummvm/scummvm/backends/PalmOS/Src
In directory sc8-pr-cvs1:/tmp/cvs-serv5262

Modified Files:
	palm.cpp palm.h 
Log Message:
clear_sound_proc

Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- palm.cpp	8 Jun 2003 09:18:21 -0000	1.11
+++ palm.cpp	9 Jun 2003 09:48:52 -0000	1.12
@@ -1131,6 +1131,7 @@
 		if (start_frame == 0 && end_frame == 0) {
 			MsaPlay(_msaRefNum, _msaTrack, 0, _msaPBRate);
 		} else {
+			// MsaTimeToSu doesn't work ...
 			_msaTrackStart = (UInt32) ((float)_msaStartFrame / ((float)fullLength / (float)SU));
 			MsaPlay(_msaRefNum, _msaTrack, _msaTrackStart, _msaPBRate);
 		}
@@ -1318,6 +1319,10 @@
 //	_sound.active = false;
 
 	return _sound.active;
+}
+
+void OSystem_PALMOS::clear_sound_proc() {
+	_sound.active = false;
 }
 
 void OSystem_PALMOS::check_sound() {

Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- palm.h	8 Jun 2003 09:18:21 -0000	1.9
+++ palm.h	9 Jun 2003 09:48:53 -0000	1.10
@@ -85,8 +85,24 @@
 	
 	void SimulateArrowKeys(Event *event, Int8 iHoriz, Int8 iVert, Boolean repeat);
 
-	// Set function that generates samples 
+	/** @name Sound */
+	//@{
+	/**
+	 * Set the audio callback which is invoked whenever samples need to be generated.
+	 * Currently, only the 16-bit signed mode is ever used for Simon & Scumm
+	 * @param proc		pointer to the callback.
+	 * @param param		an arbitrary parameter which is stored and passed to proc.
+	 * @param format	the sample type format.
+	 */
 	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
+	
+	/**
+	 * Remove any audio callback previously set via set_sound_proc, thus effectively
+	 * stopping all audio output immediately.
+	 * @see set_sound_proc
+	 */
+	void clear_sound_proc();
+	//@} 
 
 	// Poll cdrom status
 	// Returns true if cd audio is playing





More information about the Scummvm-git-logs mailing list