aboutsummaryrefslogtreecommitdiff
path: root/engines/groovie
diff options
context:
space:
mode:
Diffstat (limited to 'engines/groovie')
-rw-r--r--engines/groovie/groovie.cpp2
-rw-r--r--engines/groovie/music.cpp15
2 files changed, 8 insertions, 9 deletions
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index 131604e75c..c7c3ef85f8 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->openCD(cd_num);
+ _system->getAudioCDManager()->openCD(cd_num);
while (!shouldQuit()) {
// Give the debugger a chance to act
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 6ccc68c498..2ad11ee0e6 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)