aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
authorAlejandro Marzini2010-06-15 04:13:12 +0000
committerAlejandro Marzini2010-06-15 04:13:12 +0000
commite1ef3cd9fc059ebe8c606d330173bc3f71f8dce7 (patch)
tree46fa8fa2fb556941a0edecee0a1e1169a29232b5 /engines/groovie
parent6a52a168eeb54938c757d3be560f7ba8b30aa7c0 (diff)
downloadscummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.tar.gz
scummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.tar.bz2
scummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.zip
Renamed getAudioCD to getAudioCDManager.
svn-id: r49678
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/groovie.cpp2
-rw-r--r--engines/groovie/music.cpp12
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 8c78791630..93675b3d1e 100644
--- a/engines/groovie/groovie.cpp
+++ b/engines/groovie/groovie.cpp
@@ -217,7 +217,7 @@ Common::Error GroovieEngine::run() {
// Initialize the CD
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0)
- _system->getAudioCD()->openCD(cd_num);
+ _system->getAudioCDManager()->openCD(cd_num);
while (!shouldQuit()) {
// Show the debugger if required
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 4e0a97aabb..f2b190985d 100644
--- a/engines/groovie/music.cpp
+++ b/engines/groovie/music.cpp
@@ -41,7 +41,7 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) :
}
MusicPlayer::~MusicPlayer() {
- g_system->getAudioCD()->stop();
+ g_system->getAudioCDManager()->stop();
}
void MusicPlayer::playSong(uint32 fileref) {
@@ -89,7 +89,7 @@ void MusicPlayer::playCD(uint8 track) {
// the song number (it's track 2 on the 2nd CD)
} else if ((track == 98) && (_prevCDtrack == 3)) {
// Track 98 is used as a hack to stop the credits song
- g_system->getAudioCD()->stop();
+ g_system->getAudioCDManager()->stop();
return;
}
@@ -100,16 +100,16 @@ void MusicPlayer::playCD(uint8 track) {
// It was in the original interpreter, but it introduces a big delay
// in the middle of the introduction, so it's disabled right now
/*
- g_system->getAudioCD()->updateCD();
- while (g_system->getAudioCD()->isPlaying()) {
+ g_system->getAudioCDManager()->updateCD();
+ while (g_system->getAudioCDManager()->isPlaying()) {
// Wait a bit and try again
_vm->_system->delayMillis(100);
- g_system->getAudioCD()->updateCD();
+ g_system->getAudioCDManager()->updateCD();
}
*/
// Play the track starting at the requested offset (1000ms = 75 frames)
- g_system->getAudioCD()->play(track - 1, 1, startms * 75 / 1000, 0);
+ g_system->getAudioCDManager()->play(track - 1, 1, startms * 75 / 1000, 0);
}
void MusicPlayer::startBackground() {