[Scummvm-cvs-logs] CVS: scummvm/sound audiocd.cpp,1.3,1.4 audiocd.h,1.2,1.3
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 29 15:41:04 CET 2003
Update of /cvsroot/scummvm/scummvm/sound
In directory sc8-pr-cvs1:/tmp/cvs-serv26581
Modified Files:
audiocd.cpp audiocd.h
Log Message:
cleanup
Index: audiocd.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- audiocd.cpp 29 Nov 2003 19:49:49 -0000 1.3
+++ audiocd.cpp 29 Nov 2003 23:40:21 -0000 1.4
@@ -64,7 +64,7 @@
}
}
-int AudioCDManager::isPlaying() const {
+bool AudioCDManager::isPlaying() const {
return _cd.playing || g_system->poll_cdrom();
}
@@ -93,7 +93,7 @@
// TODO: This could be improved for "real" CD playback.
// But to do that, we have to extend the OSystem interface.
Status info = _cd;
- info.playing = isPlaying() != 0;
+ info.playing = isPlaying();
return info;
}
Index: audiocd.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound/audiocd.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- audiocd.h 29 Nov 2003 13:56:32 -0000 1.2
+++ audiocd.h 29 Nov 2003 23:40:21 -0000 1.3
@@ -47,7 +47,7 @@
void play(int track, int numLoops, int startFrame, int duration);
void stop();
- int isPlaying() const;
+ bool isPlaying() const;
void updateCD();
More information about the Scummvm-git-logs
mailing list