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/scumm | |
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/scumm')
-rw-r--r-- | engines/scumm/saveload.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/scumm.cpp | 2 | ||||
-rw-r--r-- | engines/scumm/sound.cpp | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index c178a883c4..1375281aaf 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -1372,13 +1372,13 @@ void ScummEngine::saveOrLoad(Serializer *s) { if (s->getVersion() >= VER(24)) { AudioCDManager::Status info; if (s->isSaving()) - info = _system->getAudioCD()->getStatus(); + info = _system->getAudioCDManager()->getStatus(); s->saveLoadArrayOf(&info, 1, sizeof(info), audioCDEntries); // If we are loading, and the music being loaded was supposed to loop // forever, then resume playing it. This helps a lot when the audio CD // is used to provide ambient music (see bug #788195). if (s->isLoading() && info.playing && info.numLoops < 0) - _system->getAudioCD()->play(info.track, info.numLoops, info.start, info.duration); + _system->getAudioCDManager()->play(info.track, info.numLoops, info.start, info.duration); } diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp index e348785884..2d83622f05 100644 --- a/engines/scumm/scumm.cpp +++ b/engines/scumm/scumm.cpp @@ -1149,7 +1149,7 @@ void ScummEngine::setupScumm() { int cd_num = ConfMan.getInt("cdrom"); if (cd_num >= 0) - _system->getAudioCD()->openCD(cd_num); + _system->getAudioCDManager()->openCD(cd_num); } // Create the sound manager diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 1516054679..98fa3d0e4a 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -86,7 +86,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer) Sound::~Sound() { stopCDTimer(); - g_system->getAudioCD()->stop(); + g_system->getAudioCDManager()->stop(); delete _sfxFile; } @@ -1068,7 +1068,7 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { // Play it if (!_soundsPaused) - g_system->getAudioCD()->play(track, numLoops, startFrame, duration); + g_system->getAudioCDManager()->play(track, numLoops, startFrame, duration); // Start the timer after starting the track. Starting an MP3 track is // almost instantaneous, but a CD player may take some time. Hopefully @@ -1077,15 +1077,15 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) { } void Sound::stopCD() { - g_system->getAudioCD()->stop(); + g_system->getAudioCDManager()->stop(); } int Sound::pollCD() const { - return g_system->getAudioCD()->isPlaying(); + return g_system->getAudioCDManager()->isPlaying(); } void Sound::updateCD() { - g_system->getAudioCD()->updateCD(); + g_system->getAudioCDManager()->updateCD(); } void Sound::saveLoadWithSerializer(Serializer *ser) { |