aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
Diffstat (limited to 'engines')
-rw-r--r--engines/agos/agos.cpp3
-rw-r--r--engines/agos/event.cpp5
-rw-r--r--engines/agos/res_snd.cpp7
-rw-r--r--engines/drascula/drascula.cpp2
-rw-r--r--engines/drascula/sound.cpp13
-rw-r--r--engines/gob/gob.cpp2
-rw-r--r--engines/gob/sound/cdrom.cpp5
-rw-r--r--engines/groovie/groovie.cpp2
-rw-r--r--engines/groovie/music.cpp15
-rw-r--r--engines/kyra/sound_towns.cpp31
-rw-r--r--engines/made/made.cpp7
-rw-r--r--engines/made/made.h1
-rw-r--r--engines/made/scriptfuncs.cpp13
-rw-r--r--engines/saga/music.h2
-rw-r--r--engines/sci/sound/audio.cpp11
-rw-r--r--engines/scumm/he/sound_he.cpp1
-rw-r--r--engines/scumm/saveload.cpp9
-rw-r--r--engines/scumm/scumm.cpp2
-rw-r--r--engines/scumm/sound.cpp11
-rw-r--r--engines/teenagent/teenagent.cpp3
-rw-r--r--engines/testbed/sound.cpp7
-rw-r--r--engines/tinsel/music.cpp9
-rw-r--r--engines/tinsel/tinsel.cpp7
23 files changed, 75 insertions, 93 deletions
diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index a51536381e..68fa521178 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -41,7 +41,6 @@
#include "sound/mididrv.h"
#include "sound/mods/protracker.h"
-#include "sound/audiocd.h"
namespace AGOS {
@@ -901,7 +900,7 @@ AGOSEngine::~AGOSEngine() {
_midi.close();
delete _driver;
- AudioCD.stop();
+ _system->getAudioCDManager()->stop();
for (uint i = 0; i < _itemHeap.size(); i++) {
delete[] _itemHeap[i];
diff --git a/engines/agos/event.cpp b/engines/agos/event.cpp
index 95c9db906a..2f7fdb6256 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -36,7 +36,6 @@
#include "graphics/surface.h"
-#include "sound/audiocd.h"
namespace AGOS {
@@ -429,7 +428,7 @@ void AGOSEngine::delay(uint amount) {
uint32 cur = start;
uint this_delay, vgaPeriod;
- AudioCD.updateCD();
+ _system->getAudioCDManager()->updateCD();
_debugger->onFrame();
@@ -534,7 +533,7 @@ void AGOSEngine::delay(uint amount) {
if (_leftButton == 1)
_leftButtonCount++;
- AudioCD.updateCD();
+ _system->getAudioCDManager()->updateCD();
_system->updateScreen();
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index b4c1455c10..29a4242970 100644
--- a/engines/agos/res_snd.cpp
+++ b/engines/agos/res_snd.cpp
@@ -30,7 +30,6 @@
#include "agos/agos.h"
#include "agos/vga.h"
-#include "sound/audiocd.h"
#include "sound/audiostream.h"
#include "sound/mididrv.h"
#include "sound/mods/protracker.h"
@@ -226,9 +225,9 @@ void AGOSEngine_Simon1::playMusic(uint16 music, uint16 track) {
stopMusic();
// Support for compressed music from the ScummVM Music Enhancement Project
- AudioCD.stop();
- AudioCD.play(music + 1, -1, 0, 0);
- if (AudioCD.isPlaying())
+ _system->getAudioCDManager()->stop();
+ _system->getAudioCDManager()->play(music + 1, -1, 0, 0);
+ if (_system->getAudioCDManager()->isPlaying())
return;
if (getPlatform() == Common::kPlatformAmiga) {
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 7e9f68a355..7c87f3574d 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -101,7 +101,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0)
- _system->openCD(cd_num);
+ _system->getAudioCDManager()->openCD(cd_num);
_lang = kEnglish;
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index ad9ec6ca5e..2233115f3d 100644
--- a/engines/drascula/sound.cpp
+++ b/engines/drascula/sound.cpp
@@ -23,7 +23,6 @@
*
*/
-#include "sound/audiocd.h"
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "sound/decoders/raw.h"
@@ -123,20 +122,20 @@ void DrasculaEngine::finishSound() {
}
void DrasculaEngine::playMusic(int p) {
- AudioCD.stop();
- AudioCD.play(p - 1, 1, 0, 0);
+ _system->getAudioCDManager()->stop();
+ _system->getAudioCDManager()->play(p - 1, 1, 0, 0);
}
void DrasculaEngine::stopMusic() {
- AudioCD.stop();
+ _system->getAudioCDManager()->stop();
}
void DrasculaEngine::updateMusic() {
- AudioCD.updateCD();
+ _system->getAudioCDManager()->updateCD();
}
int DrasculaEngine::musicStatus() {
- return AudioCD.isPlaying();
+ return _system->getAudioCDManager()->isPlaying();
}
void DrasculaEngine::stopSound() {
@@ -157,7 +156,7 @@ void DrasculaEngine::MusicFadeout() {
_system->updateScreen();
_system->delayMillis(50);
}
- AudioCD.stop();
+ _system->getAudioCDManager()->stop();
_system->delayMillis(100);
_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, org_vol);
}
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 4906b8f117..e8cbec270c 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -262,7 +262,7 @@ Common::Error GobEngine::run() {
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0)
- _system->openCD(cd_num);
+ _system->getAudioCDManager()->openCD(cd_num);
_global->_debugFlag = 1;
_video->_doRangeClamp = true;
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index cfd26e6bed..3316b760ef 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -26,7 +26,6 @@
#include "common/endian.h"
#include "common/str.h"
#include "common/util.h"
-#include "sound/audiocd.h"
#include "gob/gob.h"
#include "gob/sound/cdrom.h"
@@ -116,7 +115,7 @@ void CDROM::play(uint32 from, uint32 to) {
// HSG encodes frame information into a double word:
// minute multiplied by 4500, plus second multiplied by 75,
// plus frame, minus 150
- AudioCD.play(1, 1, from, to - from + 1);
+ g_system->getAudioCDManager()->play(1, 1, from, to - from + 1);
_cdPlaying = true;
}
@@ -161,7 +160,7 @@ void CDROM::stopPlaying() {
void CDROM::stop() {
_curTrackBuffer = 0;
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
_cdPlaying = false;
}
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)
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index a674f9efb8..487f5e8128 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -30,7 +30,6 @@
#include "kyra/sound_intern.h"
#include "kyra/screen.h"
-#include "sound/audiocd.h"
#include "sound/audiostream.h"
#include "sound/decoders/raw.h"
@@ -46,7 +45,7 @@ SoundTowns::SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer)
}
SoundTowns::~SoundTowns() {
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
haltTrack();
delete _driver;
delete[] _musicTrackData;
@@ -75,7 +74,7 @@ bool SoundTowns::init() {
}
void SoundTowns::process() {
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->updateCD();
}
void SoundTowns::playTrack(uint8 track) {
@@ -83,7 +82,7 @@ void SoundTowns::playTrack(uint8 track) {
return;
track -= 2;
- const int32 * const tTable = (const int32 *)cdaData();
+ const int32 *const tTable = (const int32 *const)cdaData();
int tTableIndex = 3 * track;
int trackNum = (int)READ_LE_UINT32(&tTable[tTableIndex + 2]);
@@ -96,8 +95,8 @@ void SoundTowns::playTrack(uint8 track) {
if (_musicEnabled == 2 && trackNum != -1) {
_driver->setOutputVolume(1, 118, 118);
- AudioCD.play(trackNum+1, loop ? -1 : 1, 0, 0);
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->play(trackNum + 1, loop ? -1 : 1, 0, 0);
+ g_system->getAudioCDManager()->updateCD();
_cdaPlaying = true;
} else if (_musicEnabled) {
playEuphonyTrack(READ_LE_UINT32(&tTable[tTableIndex]), loop);
@@ -109,8 +108,8 @@ void SoundTowns::playTrack(uint8 track) {
void SoundTowns::haltTrack() {
_lastTrack = -1;
- AudioCD.stop();
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->stop();
+ g_system->getAudioCDManager()->updateCD();
_cdaPlaying = false;
for (int i = 0; i < 6; i++)
@@ -437,8 +436,8 @@ void SoundPC98::playTrack(uint8 track) {
void SoundPC98::haltTrack() {
_lastTrack = -1;
- AudioCD.stop();
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->stop();
+ g_system->getAudioCDManager()->updateCD();
_driver->reset();
}
@@ -521,7 +520,7 @@ void SoundTownsPC98_v2::loadSoundFile(Common::String file) {
}
void SoundTownsPC98_v2::process() {
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->updateCD();
}
void SoundTownsPC98_v2::playTrack(uint8 track) {
@@ -530,7 +529,7 @@ void SoundTownsPC98_v2::playTrack(uint8 track) {
if (track == _lastTrack && _musicEnabled)
return;
- const uint16 * const cdaTracks = (const uint16 *)cdaData();
+ const uint16 *const cdaTracks = (const uint16 *const) cdaData();
int trackNum = -1;
if (_vm->gameFlags().platform == Common::kPlatformFMTowns) {
@@ -558,8 +557,8 @@ void SoundTownsPC98_v2::playTrack(uint8 track) {
_driver->loadMusicData(_musicTrackData, true);
if (_musicEnabled == 2 && trackNum != -1) {
- AudioCD.play(trackNum+1, _driver->looping() ? -1 : 1, 0, 0);
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->play(trackNum+1, _driver->looping() ? -1 : 1, 0, 0);
+ g_system->getAudioCDManager()->updateCD();
} else if (_musicEnabled) {
_driver->cont();
}
@@ -569,8 +568,8 @@ void SoundTownsPC98_v2::playTrack(uint8 track) {
void SoundTownsPC98_v2::haltTrack() {
_lastTrack = -1;
- AudioCD.stop();
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->stop();
+ g_system->getAudioCDManager()->updateCD();
_driver->reset();
}
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 1fc3982d1e..4434f5e159 100644
--- a/engines/made/made.cpp
+++ b/engines/made/made.cpp
@@ -38,7 +38,6 @@
#include "base/plugins.h"
#include "base/version.h"
-#include "sound/audiocd.h"
#include "sound/mixer.h"
#include "made/made.h"
@@ -83,7 +82,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0)
- _system->openCD(cd_num);
+ _system->getAudioCDManager()->openCD(cd_num);
_pmvPlayer = new PmvPlayer(this, _mixer);
_res = new ResourceReader();
@@ -132,7 +131,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
}
MadeEngine::~MadeEngine() {
- AudioCD.stop();
+ _system->getAudioCDManager()->stop();
delete _rnd;
delete _console;
@@ -251,7 +250,7 @@ void MadeEngine::handleEvents() {
}
}
- AudioCD.updateCD();
+ _system->getAudioCDManager()->updateCD();
}
diff --git a/engines/made/made.h b/engines/made/made.h
index 290e3e648a..302c8f5275 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -42,7 +42,6 @@
#include "sound/audiostream.h"
#include "sound/mixer.h"
#include "sound/decoders/voc.h"
-#include "sound/audiocd.h"
#include "engines/engine.h"
diff --git a/engines/made/scriptfuncs.cpp b/engines/made/scriptfuncs.cpp
index 8d01ec70f3..2f069e882e 100644
--- a/engines/made/scriptfuncs.cpp
+++ b/engines/made/scriptfuncs.cpp
@@ -27,7 +27,6 @@
#include "common/util.h"
#include "common/events.h"
#include "graphics/cursorman.h"
-#include "sound/audiocd.h"
#include "sound/softsynth/pcspk.h"
#include "made/made.h"
@@ -654,9 +653,9 @@ int16 ScriptFunctions::sfPlayVoice(int16 argc, int16 *argv) {
}
int16 ScriptFunctions::sfPlayCd(int16 argc, int16 *argv) {
- AudioCD.play(argv[0] - 1, 1, 0, 0);
+ g_system->getAudioCDManager()->play(argv[0] - 1, 1, 0, 0);
_vm->_cdTimeStart = _vm->_system->getMillis();
- if (AudioCD.isPlaying()) {
+ if (g_system->getAudioCDManager()->isPlaying()) {
return 1;
} else {
return 0;
@@ -664,8 +663,8 @@ int16 ScriptFunctions::sfPlayCd(int16 argc, int16 *argv) {
}
int16 ScriptFunctions::sfStopCd(int16 argc, int16 *argv) {
- if (AudioCD.isPlaying()) {
- AudioCD.stop();
+ if (g_system->getAudioCDManager()->isPlaying()) {
+ g_system->getAudioCDManager()->stop();
return 1;
} else {
return 0;
@@ -673,11 +672,11 @@ int16 ScriptFunctions::sfStopCd(int16 argc, int16 *argv) {
}
int16 ScriptFunctions::sfGetCdStatus(int16 argc, int16 *argv) {
- return AudioCD.isPlaying() ? 1 : 0;
+ return g_system->getAudioCDManager()->isPlaying() ? 1 : 0;
}
int16 ScriptFunctions::sfGetCdTime(int16 argc, int16 *argv) {
- if (AudioCD.isPlaying()) {
+ if (g_system->getAudioCDManager()->isPlaying()) {
uint32 deltaTime = _vm->_system->getMillis() - _vm->_cdTimeStart;
// This basically converts the time from milliseconds to MSF format to MADE's format
return (deltaTime / 1000 * 30) + (deltaTime % 1000 / 75 * 30 / 75);
diff --git a/engines/saga/music.h b/engines/saga/music.h
index b4d868ed78..c7fef7225b 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -28,9 +28,9 @@
#ifndef SAGA_MUSIC_H
#define SAGA_MUSIC_H
-#include "sound/audiocd.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
+#include "sound/mixer.h"
#include "sound/decoders/mp3.h"
#include "sound/decoders/vorbis.h"
#include "sound/decoders/flac.h"
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 4a2a8e65d7..640273c20e 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -32,7 +32,6 @@
#include "common/file.h"
#include "common/system.h"
-#include "sound/audiocd.h"
#include "sound/audiostream.h"
#include "sound/decoders/aiff.h"
#include "sound/decoders/flac.h"
@@ -413,7 +412,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.
- AudioCD.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
@@ -436,7 +435,7 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) {
// Jones uses the track as the resource value in the map
if (res == track) {
- AudioCD.play(1, 1, startFrame, length);
+ g_system->getAudioCDManager()->play(1, 1, startFrame, length);
_audioCdStart = g_system->getMillis();
break;
}
@@ -450,16 +449,16 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) {
void AudioPlayer::audioCdStop() {
_audioCdStart = 0;
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
}
void AudioPlayer::audioCdUpdate() {
- AudioCD.updateCD();
+ 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)AudioCD.getStatus().duration)
+ if (((g_system->getMillis() - _audioCdStart) * 75 / 1000) >= (uint32)g_system->getAudioCDManager()->getStatus().duration)
return -1;
// Return the position otherwise (in ticks).
diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp
index 318cb818b6..1d02a95b30 100644
--- a/engines/scumm/he/sound_he.cpp
+++ b/engines/scumm/he/sound_he.cpp
@@ -36,7 +36,6 @@
#include "common/util.h"
#include "sound/decoders/adpcm.h"
-#include "sound/audiocd.h"
#include "sound/decoders/flac.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index 9cb603e27f..58bb817292 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -43,7 +43,6 @@
#include "scumm/he/sprite_he.h"
#include "scumm/verbs.h"
-#include "sound/audiocd.h"
#include "sound/mixer.h"
#include "graphics/thumbnail.h"
@@ -1107,7 +1106,7 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// as AudioCDManager::Status::playing, and MSVC6 has
// a fit with that. This typedef simplifies the notation
// to something MSVC6 can grasp.
- typedef Audio::AudioCDManager::Status AudioCDManager_Status;
+ typedef AudioCDManager::Status AudioCDManager_Status;
const SaveLoadEntry audioCDEntries[] = {
MKLINE(AudioCDManager_Status, playing, sleUint32, VER(24)),
MKLINE(AudioCDManager_Status, track, sleInt32, VER(24)),
@@ -1408,15 +1407,15 @@ void ScummEngine::saveOrLoad(Serializer *s) {
// Save/load the Audio CD status
//
if (s->getVersion() >= VER(24)) {
- Audio::AudioCDManager::Status info;
+ AudioCDManager::Status info;
if (s->isSaving())
- info = AudioCD.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)
- AudioCD.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 405c81f91b..392b3ca3c4 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1200,7 +1200,7 @@ void ScummEngine::setupScumm() {
int cd_num = ConfMan.getInt("cdrom");
if (cd_num >= 0)
- _system->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 8fc6de8af9..af7bc5f295 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -37,7 +37,6 @@
#include "scumm/util.h"
#include "sound/decoders/adpcm.h"
-#include "sound/audiocd.h"
#include "sound/decoders/flac.h"
#include "sound/mididrv.h"
#include "sound/mixer.h"
@@ -89,7 +88,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer)
Sound::~Sound() {
stopCDTimer();
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
delete _sfxFile;
}
@@ -1027,7 +1026,7 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
// Play it
if (!_soundsPaused)
- AudioCD.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
@@ -1036,15 +1035,15 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
}
void Sound::stopCD() {
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
}
int Sound::pollCD() const {
- return AudioCD.isPlaying();
+ return g_system->getAudioCDManager()->isPlaying();
}
void Sound::updateCD() {
- AudioCD.updateCD();
+ g_system->getAudioCDManager()->updateCD();
}
void Sound::saveLoadWithSerializer(Serializer *ser) {
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index 4d300ff7fd..ebc2cd152d 100644
--- a/engines/teenagent/teenagent.cpp
+++ b/engines/teenagent/teenagent.cpp
@@ -31,7 +31,6 @@
#include "engines/advancedDetector.h"
#include "engines/util.h"
-#include "sound/audiocd.h"
#include "sound/mixer.h"
#include "sound/decoders/raw.h"
@@ -983,7 +982,7 @@ void TeenAgentEngine::setMusic(byte id) {
}
byte track = track2cd[id - 1];
debug(0, "playing cd track %u", track);
- Audio::AudioCDManager::instance().play(track, -1, 0, 0);
+ _system->getAudioCDManager()->play(track, -1, 0, 0);
} else if (music->load(id))
music->start();
}
diff --git a/engines/testbed/sound.cpp b/engines/testbed/sound.cpp
index 615793da74..b2f61ab714 100644
--- a/engines/testbed/sound.cpp
+++ b/engines/testbed/sound.cpp
@@ -22,7 +22,6 @@
* $Id$
*/
-#include "sound/audiocd.h"
#include "sound/softsynth/pcspk.h"
#include "testbed/sound.h"
@@ -190,8 +189,8 @@ TestExitStatus SoundSubsystem::audiocdOutput() {
// Play all tracks
for (int i = 1; i < 5; i++) {
- AudioCD.play(i, 1, 0, 0);
- while (AudioCD.isPlaying()) {
+ g_system->getAudioCDManager()->play(i, 1, 0, 0);
+ while (g_system->getAudioCDManager()->isPlaying()) {
g_system->delayMillis(500);
Testsuite::writeOnScreen(Common::String::format("Playing Now: track%02d", i), pt);
}
@@ -200,7 +199,7 @@ TestExitStatus SoundSubsystem::audiocdOutput() {
Testsuite::clearScreen();
if (Testsuite::handleInteractiveInput("Were all the tracks played in order i.e 1-2-3-last ?", "Yes", "No", kOptionRight)) {
- Testsuite::logPrintf("Error! Error in AudioCD.play() or probably sound files were not detected, try -d1 (debuglevel 1)\n");
+ Testsuite::logPrintf("Error! Error in _system->getAudioCDManager()->play() or probably sound files were not detected, try -d1 (debuglevel 1)\n");
passed = kTestFailed;
}
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index f21c41a843..b46424704c 100644
--- a/engines/tinsel/music.cpp
+++ b/engines/tinsel/music.cpp
@@ -30,7 +30,6 @@
#include "sound/audiostream.h"
#include "sound/mididrv.h"
#include "sound/midiparser.h"
-#include "sound/audiocd.h"
#include "sound/decoders/adpcm.h"
#include "common/config-manager.h"
#include "common/file.h"
@@ -191,11 +190,11 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
currentLoop = bLoop;
// try to play track, but don't fall back to a true CD
- AudioCD.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 (AudioCD.isPlaying()) {
+ if (g_system->getAudioCDManager()->isPlaying()) {
return true;
}
}
@@ -270,7 +269,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
*/
bool MidiPlaying() {
if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) {
- if (AudioCD.isPlaying())
+ if (g_system->getAudioCDManager()->isPlaying())
return true;
}
return _vm->_midiMusic->isPlaying();
@@ -284,7 +283,7 @@ bool StopMidi() {
currentLoop = false;
if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) {
- AudioCD.stop();
+ g_system->getAudioCDManager()->stop();
}
_vm->_midiMusic->stop();
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();
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-12 03:12:22 +0000