diff options
| author | Max Horn | 2010-11-08 22:53:36 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-08 22:53:36 +0000 |
| commit | 82e473bc3b1498325bad28d804e4314f0c3a528c (patch) | |
| tree | f186d8b9eeb665a81897deca3a3fadcf74007c16 /engines/tinsel/tinsel.cpp | |
| parent | 4242229c91c356bdd90c66ce8c0642488a1b4bf5 (diff) | |
| parent | 74a53df11b51fa4956745c086b2e6351b8383568 (diff) | |
| download | scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.gz scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.tar.bz2 scummvm-rg350-82e473bc3b1498325bad28d804e4314f0c3a528c.zip | |
BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only
This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).
The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.
svn-id: r54147
Diffstat (limited to 'engines/tinsel/tinsel.cpp')
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 049870a20e..386a402af4 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -45,7 +45,6 @@ #include "sound/mididrv.h" #include "sound/mixer.h" -#include "sound/audiocd.h" #include "tinsel/actors.h" #include "tinsel/background.h" @@ -853,7 +852,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->openCD(cd_num); + _system->getAudioCDManager()->openCD(cd_num); MidiDriver::DeviceHandle dev = MidiDriver::detectDevice(MDT_MIDI | MDT_ADLIB | MDT_PREFER_GM); bool native_mt32 = ((MidiDriver::getMusicType(dev) == MT_MT32) || ConfMan.getBool("native_mt32")); @@ -889,7 +888,7 @@ TinselEngine::~TinselEngine() { if (_bmv->MoviePlaying()) _bmv->FinishBMV(); - AudioCD.stop(); + _system->getAudioCDManager()->stop(); delete _bmv; delete _sound; delete _midiMusic; @@ -999,7 +998,7 @@ Common::Error TinselEngine::run() { // Check for time to do next game cycle if ((g_system->getMillis() > timerVal + GAME_FRAME_DELAY)) { timerVal = g_system->getMillis(); - AudioCD.updateCD(); + _system->getAudioCDManager()->updateCD(); NextGameCycle(); } |