[Scummvm-cvs-logs] CVS: scummvm/backends/PalmOS/Src palm.cpp,1.17,1.18 palm.h,1.12,1.13

Max Horn fingolfin at users.sourceforge.net
Tue Jul 22 13:37:24 CEST 2003


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

Modified Files:
	palm.cpp palm.h 
Log Message:
adjusted to play_cdrom parameter name change in common/system.h

Index: palm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- palm.cpp	22 Jul 2003 08:33:13 -0000	1.17
+++ palm.cpp	22 Jul 2003 20:36:42 -0000	1.18
@@ -1089,7 +1089,7 @@
 	FrmCustomAlert(1000,err,0,0);
 }
 
-void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int end_frame) {
+void OSystem_PALMOS::play_cdrom(int track, int num_loops, int start_frame, int duration) {
 	if (!_isCDRomAvalaible)
 		return;
 
@@ -1131,13 +1131,13 @@
 	if (start_frame > 0)
 		start_frame += CD_FPS >> 1;
 
-	if (end_frame > 0)
-		end_frame += CD_FPS >> 1;
+	if (duration > 0)
+		duration += CD_FPS >> 1;
 
 	_msaLoops = num_loops;
 	_msaTrack = track + gVars->music.firstTrack - 1;	// first track >= 1 ?, not 0 (0=album)
 	_msaStartFrame = TO_MSECS(start_frame);
-	_msaEndFrame = TO_MSECS(end_frame);
+	_msaEndFrame = TO_MSECS(duration);
 
 	// if gVars->MP3 audio track
 //	Err e;
@@ -1182,7 +1182,7 @@
 		_msaEndTime = get_msecs() + _msaTrackLength - 2000; // 2sec less ...
 
 		// try to play the track
-		if (start_frame == 0 && end_frame == 0) {
+		if (start_frame == 0 && duration == 0) {
 			MsaPlay(_msaRefNum, _msaTrack, 0, _msaPBRate);
 		} else {
 			// FIXME : MsaTimeToSu doesn't work ... (may work with previous FIXME)

Index: palm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/PalmOS/Src/palm.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- palm.h	7 Jul 2003 08:45:20 -0000	1.12
+++ palm.h	22 Jul 2003 20:36:43 -0000	1.13
@@ -126,7 +126,7 @@
 	bool poll_cdrom();
 
 	// Play cdrom audio track
-	void play_cdrom(int track, int num_loops, int start_frame, int end_frame);
+	void play_cdrom(int track, int num_loops, int start_frame, int duration);
 
 	// Stop cdrom audio track
 	void stop_cdrom();





More information about the Scummvm-git-logs mailing list