[Scummvm-cvs-logs] CVS: scummvm/scumm sound.cpp,1.277,1.278

Max Horn fingolfin at users.sourceforge.net
Sat Nov 29 05:57:03 CET 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv21671/scumm

Modified Files:
	sound.cpp 
Log Message:
added API to query CD playback status; renamed AudioCDManager methods

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -d -r1.277 -r1.278
--- sound.cpp	29 Nov 2003 12:11:01 -0000	1.277
+++ sound.cpp	29 Nov 2003 13:56:33 -0000	1.278
@@ -1364,7 +1364,7 @@
 
 	// Play it
 	if (!_soundsPaused)
-		AudioCD.playCDTrack(track, numLoops, startFrame, duration);
+		AudioCD.play(track, numLoops, startFrame, duration);
 
 	// Start the timer after starting the track. Starting an MP3 track is
 	// almost instantaneous, but a CD player may take some time. Hopefully
@@ -1373,11 +1373,11 @@
 }
 
 void Sound::stopCD() {
-	AudioCD.stopCD();
+	AudioCD.stop();
 }
 
 int Sound::pollCD() const {
-	return AudioCD.pollCD();
+	return AudioCD.isPlaying();
 }
 
 void Sound::updateCD() {





More information about the Scummvm-git-logs mailing list