diff options
| author | Alejandro Marzini | 2010-06-15 04:13:12 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-06-15 04:13:12 +0000 |
| commit | e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7 (patch) | |
| tree | 46fa8fa2fb556941a0edecee0a1e1169a29232b5 /engines/tinsel | |
| parent | 6a52a168eeb54938c757d3be560f7ba8b30aa7c0 (diff) | |
| download | scummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.tar.gz scummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.tar.bz2 scummvm-rg350-e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7.zip | |
Renamed getAudioCD to getAudioCDManager.
svn-id: r49678
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/music.cpp | 8 | ||||
| -rw-r--r-- | engines/tinsel/tinsel.cpp | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 0dd62dc9c4..cb246bc8b3 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -211,11 +211,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { currentLoop = bLoop; // try to play track, but don't fall back to a true CD - g_system->getAudioCD()->play(track, bLoop ? -1 : 1, 0, 0, true); + g_system->getAudioCDManager()->play(track, bLoop ? -1 : 1, 0, 0, true); // Check if an enhanced audio track is being played. // If it is, stop here and don't load a MIDI track - if (g_system->getAudioCD()->isPlaying()) { + if (g_system->getAudioCDManager()->isPlaying()) { return true; } } @@ -290,7 +290,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { */ bool MidiPlaying() { if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - if (g_system->getAudioCD()->isPlaying()) + if (g_system->getAudioCDManager()->isPlaying()) return true; } return _vm->_midiMusic->isPlaying(); @@ -304,7 +304,7 @@ bool StopMidi() { currentLoop = false; if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) { - g_system->getAudioCD()->stop(); + g_system->getAudioCDManager()->stop(); } _vm->_midiMusic->stop(); diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp index 8bebd635d0..4335b51818 100644 --- a/engines/tinsel/tinsel.cpp +++ b/engines/tinsel/tinsel.cpp @@ -853,7 +853,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc) int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->getAudioCD()->openCD(cd_num); + _system->getAudioCDManager()->openCD(cd_num); MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI); bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32")); @@ -884,7 +884,7 @@ TinselEngine::~TinselEngine() { if (_bmv->MoviePlaying()) _bmv->FinishBMV(); - _system->getAudioCD()->stop(); + _system->getAudioCDManager()->stop(); delete _bmv; delete _sound; delete _midiMusic; @@ -1006,7 +1006,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(); - _system->getAudioCD()->updateCD(); + _system->getAudioCDManager()->updateCD(); NextGameCycle(); } |