diff options
Diffstat (limited to 'engines/groovie/music.cpp')
-rw-r--r-- | engines/groovie/music.cpp | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp index 6959a6a6f1..34b180a68e 100644 --- a/engines/groovie/music.cpp +++ b/engines/groovie/music.cpp @@ -29,7 +29,6 @@ #include "common/config-manager.h" #include "common/macresman.h" -#include "sound/audiocd.h" #include "sound/midiparser.h" namespace Groovie { @@ -42,7 +41,7 @@ MusicPlayer::MusicPlayer(GroovieEngine *vm) : } MusicPlayer::~MusicPlayer() { - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); } void MusicPlayer::playSong(uint32 fileref) { @@ -90,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 - AudioCD.stop(); + g_system->getAudioCDManager()->stop(); return; } @@ -101,20 +100,20 @@ 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 /* - AudioCD.updateCD(); - while (AudioCD.isPlaying()) { + g_system->getAudioCDManager()->updateCD(); + while (g_system->getAudioCDManager()->isPlaying()) { // Wait a bit and try again _vm->_system->delayMillis(100); - AudioCD.updateCD(); + g_system->getAudioCDManager()->updateCD(); } */ // Play the track starting at the requested offset (1000ms = 75 frames) - AudioCD.play(track - 1, 1, startms * 75 / 1000, 0); + g_system->getAudioCDManager()->play(track - 1, 1, startms * 75 / 1000, 0); // If the audio is not playing from the CD, play the "fallback" MIDI. // The Mac version has no CD tracks, so it will always use the MIDI. - if (!AudioCD.isPlaying()) { + if (!g_system->getAudioCDManager()->isPlaying()) { if (track == 2) { // Intro MIDI fallback if (_vm->getPlatform() == Common::kPlatformMacintosh) |