[Scummvm-cvs-logs] CVS: scummvm/backends/sdl sdl-common.cpp,1.12,1.13

James Brown ender at users.sourceforge.net
Sun Oct 20 06:18:04 CEST 2002


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory usw-pr-cvs1:/tmp/cvs-serv31840/backends/sdl

Modified Files:
	sdl-common.cpp 
Log Message:
Patch 625904: CD Looping


Index: sdl-common.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- sdl-common.cpp	16 Oct 2002 20:32:10 -0000	1.12
+++ sdl-common.cpp	20 Oct 2002 13:17:43 -0000	1.13
@@ -825,8 +825,11 @@
 	cd_num_loops = num_loops;
 	cd_start_frame = start_frame;
 
-	SDL_CDStatus(_cdrom);	
-	SDL_CDPlayTracks(_cdrom, track, start_frame, 0, end_frame);
+	SDL_CDStatus(_cdrom);
+	if (start_frame == 0 && end_frame == 0)
+		SDL_CDPlayTracks(_cdrom, track, 0, 1, 0);
+	else
+		SDL_CDPlayTracks(_cdrom, track, start_frame, 0, end_frame);
 	cd_end_frame = end_frame;
 	cd_stop_time = 0;
 	cd_end_time = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS;
@@ -863,7 +866,10 @@
 		cd_num_loops--;
 
 	if (cd_num_loops != 0) {
-		SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_end_frame);
+		if (cd_start_frame == 0 && cd_end_frame == 0)
+			SDL_CDPlayTracks(_cdrom, cd_track, 0, 1, 0);
+		else
+			SDL_CDPlayTracks(_cdrom, cd_track, cd_start_frame, 0, cd_end_frame);
 		cd_end_time = SDL_GetTicks() + _cdrom->track[cd_track].length * 1000 / CD_FPS;
 	}
 }





More information about the Scummvm-git-logs mailing list