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/sci/sound/audio.cpp | |
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/sci/sound/audio.cpp')
-rw-r--r-- | engines/sci/sound/audio.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 4803d6d756..7ecce3b2a3 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -374,7 +374,7 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) { // Subtract one from track. KQ6 starts at track 1, while ScummVM // ignores the data track and considers track 2 to be track 1. - g_system->getAudioCD()->play(track - 1, 1, start, duration); + g_system->getAudioCDManager()->play(track - 1, 1, start, duration); return 1; } else { // Jones in the Fast Lane CD Audio format @@ -397,7 +397,7 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) { // Jones uses the track as the resource value in the map if (res == track) { - g_system->getAudioCD()->play(1, 1, startFrame, length); + g_system->getAudioCDManager()->play(1, 1, startFrame, length); _audioCdStart = g_system->getMillis(); break; } @@ -411,16 +411,16 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) { void AudioPlayer::audioCdStop() { _audioCdStart = 0; - g_system->getAudioCD()->stop(); + g_system->getAudioCDManager()->stop(); } void AudioPlayer::audioCdUpdate() { - g_system->getAudioCD()->update(); + g_system->getAudioCDManager()->update(); } int AudioPlayer::audioCdPosition() { // Return -1 if the sample is done playing. Converting to frames to compare. - if (((g_system->getMillis() - _audioCdStart) * 75 / 1000) >= (uint32)g_system->getAudioCD()->getStatus().duration) + if (((g_system->getMillis() - _audioCdStart) * 75 / 1000) >= (uint32)g_system->getAudioCDManager()->getStatus().duration) return -1; // Return the position otherwise (in ticks). |