[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.71,1.72 sdl-common.h,1.30,1.31

[Max Horn]

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

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

Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- sdl-common.cpp	20 Jul 2003 18:53:26 -0000	1.71
+++ sdl-common.cpp	22 Jul 2003 20:36:43 -0000	1.72
@@ -1090,26 +1090,26 @@
 	cd_num_loops = 0;
 }
 
-void OSystem_SDL_Common::play_cdrom(int track, int num_loops, int start_frame, int end_frame) {
+void OSystem_SDL_Common::play_cdrom(int track, int num_loops, int start_frame, int duration) {
 	if (!num_loops && !start_frame)
 		return;
 
 	if (!_cdrom)
 		return;
 	
-	if (end_frame > 0)
-		end_frame +=5;
+	if (duration > 0)
+		duration +=5;
 
 	cd_track = track;
 	cd_num_loops = num_loops;
 	cd_start_frame = start_frame;
 
 	SDL_CDStatus(_cdrom);
-	if (start_frame == 0 && end_frame == 0)
+	if (start_frame == 0 && duration == 0)
 		SDL_CDPlayTracks(_cdrom, track, 0, 1, 0);
 	else
-		SDL_CDPlayTracks(_cdrom, track, start_frame, 0, end_frame);
-	cd_end_frame = end_frame;
+		SDL_CDPlayTracks(_cdrom, track, start_frame, 0, duration);
+	cd_duration = duration;
 	cd_stop_time = 0;
 	cd_end_time = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS;
 }
@@ -1145,10 +1145,10 @@
 		cd_num_loops--;
 
 	if (cd_num_loops != 0) {
-		if (cd_start_frame == 0 && cd_end_frame == 0)
+		if (cd_start_frame == 0 && cd_duration == 0)
 			SDL_CDPlayTracks(_cdrom, cd_track, 0, 1, 0);
 		else
-			SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_end_frame);
+			SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_duration);
 		cd_end_time = SDL_GetTicks() + _cdrom->track[cd_track].length * 1000 / CD_FPS;
 	}
 }

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- sdl-common.h	5 Jul 2003 15:17:46 -0000	1.30
+++ sdl-common.h	22 Jul 2003 20:36:43 -0000	1.31
@@ -87,7 +87,7 @@
 	bool poll_cdrom();
 
 	// Play CD 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 CD audio track
 	void stop_cdrom();
@@ -146,7 +146,7 @@
 
 	// CD Audio
 	SDL_CD *_cdrom;
-	int cd_track, cd_num_loops, cd_start_frame, cd_end_frame;
+	int cd_track, cd_num_loops, cd_start, cd_duration;
 	Uint32 cd_end_time, cd_stop_time, cd_next_second;
 
 	enum {