- Revised abstract AudioCDManager.

- Removed AudioCDManager Singleton, and changed code for using AudioCDManager in OSystem.
- Added initialization code for new AudioCDManager in BaseBackend and OSystem_SDL.

svn-id: r49548

22 files changed, 71 insertions, 89 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 926b3a8972..efb9ae46da 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"
 
 using Common::File;
 
@@ -901,7 +900,7 @@ AGOSEngine::~AGOSEngine() {
 	_midi.close();
 	delete _driver;
 
-	AudioCD.stop();
+	_system->getAudioCD()->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 1340d85236..7287ff07d2 100644
--- a/engines/agos/event.cpp
+++ b/engines/agos/event.cpp
@@ -36,8 +36,6 @@
 
 #include "graphics/surface.h"
 
-#include "sound/audiocd.h"
-
 namespace AGOS {
 
 void AGOSEngine::addTimeEvent(uint16 timeout, uint16 subroutine_id) {
@@ -429,7 +427,7 @@ void AGOSEngine::delay(uint amount) {
 	uint32 cur = start;
 	uint this_delay, vgaPeriod;
 
-	AudioCD.updateCD();
+	_system->getAudioCD()->updateCD();
 
 	if (_debugger->isAttached())
 		_debugger->onFrame();
@@ -535,7 +533,7 @@ void AGOSEngine::delay(uint amount) {
 		if (_leftButton == 1)
 			_leftButtonCount++;
 
-		AudioCD.updateCD();
+		_system->getAudioCD()->updateCD();
 
 		_system->updateScreen();
 
diff --git a/engines/agos/res_snd.cpp b/engines/agos/res_snd.cpp
index 6e54d926c4..11f675289b 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"
@@ -228,9 +227,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->getAudioCD()->stop();
+	_system->getAudioCD()->play(music + 1, -1, 0, 0);
+	if (_system->getAudioCD()->isPlaying())
 		return;
 
 	if (getPlatform() == Common::kPlatformAmiga) {
diff --git a/engines/drascula/drascula.cpp b/engines/drascula/drascula.cpp
index 2c3ca63600..dc1d54b808 100644
--- a/engines/drascula/drascula.cpp
+++ b/engines/drascula/drascula.cpp
@@ -100,7 +100,7 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
 
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0)
-		_system->openCD(cd_num);
+		_system->getAudioCD()->openCD(cd_num);
 
 	_lang = kEnglish;
 
diff --git a/engines/drascula/sound.cpp b/engines/drascula/sound.cpp
index ad9ec6ca5e..934610ba4d 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->getAudioCD()->stop();
+	_system->getAudioCD()->play(p - 1, 1, 0, 0);
 }
 
 void DrasculaEngine::stopMusic() {
-	AudioCD.stop();
+	_system->getAudioCD()->stop();
 }
 
 void DrasculaEngine::updateMusic() {
-	AudioCD.updateCD();
+	_system->getAudioCD()->updateCD();
 }
 
 int DrasculaEngine::musicStatus() {
-	return AudioCD.isPlaying();
+	return _system->getAudioCD()->isPlaying();
 }
 
 void DrasculaEngine::stopSound() {
@@ -157,7 +156,7 @@ void DrasculaEngine::MusicFadeout() {
 		_system->updateScreen();
 		_system->delayMillis(50);
 	}
-	AudioCD.stop();
+	_system->getAudioCD()->stop();
 	_system->delayMillis(100);
 	_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, org_vol);
 }
diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index e3472e9fe1..5dc2da6e0c 100644
--- a/engines/gob/gob.cpp
+++ b/engines/gob/gob.cpp
@@ -243,7 +243,7 @@ Common::Error GobEngine::run() {
 
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0)
-		_system->openCD(cd_num);
+		_system->getAudioCD()->openCD(cd_num);
 
 	_global->_debugFlag = 1;
 	_video->_doRangeClamp = true;
diff --git a/engines/gob/sound/cdrom.cpp b/engines/gob/sound/cdrom.cpp
index 8f0b1df23e..ed006ca722 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -25,7 +25,6 @@
 
 #include "common/endian.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->getAudioCD()->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->getAudioCD()->stop();
 	_cdPlaying = false;
 }
 
diff --git a/engines/groovie/groovie.cpp b/engines/groovie/groovie.cpp
index e0760e1d41..8c78791630 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->getAudioCD()->openCD(cd_num);
 
 	while (!shouldQuit()) {
 		// Show the debugger if required
diff --git a/engines/groovie/music.cpp b/engines/groovie/music.cpp
index 2ea7454256..4e0a97aabb 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->getAudioCD()->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->getAudioCD()->stop();
 		return;
 	}
 
@@ -101,16 +100,16 @@ 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->getAudioCD()->updateCD();
+	while (g_system->getAudioCD()->isPlaying()) {
 		// Wait a bit and try again
 		_vm->_system->delayMillis(100);
-		AudioCD.updateCD();
+		g_system->getAudioCD()->updateCD();
 	}
 	*/
 
 	// Play the track starting at the requested offset (1000ms = 75 frames)
-	AudioCD.play(track - 1, 1, startms * 75 / 1000, 0);
+	g_system->getAudioCD()->play(track - 1, 1, startms * 75 / 1000, 0);
 }
 
 void MusicPlayer::startBackground() {
diff --git a/engines/kyra/sound_towns.cpp b/engines/kyra/sound_towns.cpp
index b0d3f994f2..6711ea6407 100644
--- a/engines/kyra/sound_towns.cpp
+++ b/engines/kyra/sound_towns.cpp
@@ -28,7 +28,6 @@
 #include "kyra/sound_intern.h"
 #include "kyra/screen.h"
 
-#include "sound/audiocd.h"
 #include "sound/audiostream.h"
 #include "sound/decoders/raw.h"
 
@@ -3775,7 +3774,7 @@ SoundTowns::SoundTowns(KyraEngine_v1 *vm, Audio::Mixer *mixer)
 }
 
 SoundTowns::~SoundTowns() {
-	AudioCD.stop();
+	g_system->getAudioCD()->stop();
 	haltTrack();
 	delete[] _sfxFileData;
 
@@ -3796,7 +3795,7 @@ bool SoundTowns::init() {
 }
 
 void SoundTowns::process() {
-	AudioCD.updateCD();
+	g_system->getAudioCD()->updateCD();
 }
 
 void SoundTowns::playTrack(uint8 track) {
@@ -3816,8 +3815,8 @@ void SoundTowns::playTrack(uint8 track) {
 	beginFadeOut();
 
 	if (_musicEnabled == 2 && trackNum != -1) {
-		AudioCD.play(trackNum+1, loop ? -1 : 1, 0, 0);
-		AudioCD.updateCD();
+		g_system->getAudioCD()->play(trackNum+1, loop ? -1 : 1, 0, 0);
+		g_system->getAudioCD()->updateCD();
 	} else if (_musicEnabled) {
 		playEuphonyTrack(READ_LE_UINT32(&tTable[tTableIndex]), loop);
 	}
@@ -3827,8 +3826,8 @@ void SoundTowns::playTrack(uint8 track) {
 
 void SoundTowns::haltTrack() {
 	_lastTrack = -1;
-	AudioCD.stop();
-	AudioCD.updateCD();
+	g_system->getAudioCD()->stop();
+	g_system->getAudioCD()->updateCD();
 	if (_parser) {
 		Common::StackLock lock(_mutex);
 		_parser->setTrack(0);
@@ -3936,8 +3935,8 @@ void SoundTowns::beginFadeOut() {
 	_driver->fading();
 
 	// TODO: this should fade out too
-	AudioCD.stop();
-	AudioCD.updateCD();
+	g_system->getAudioCD()->stop();
+	g_system->getAudioCD()->updateCD();
 }
 
 int SoundTowns::open() {
@@ -4099,8 +4098,8 @@ void SoundPC98::playTrack(uint8 track) {
 
 void SoundPC98::haltTrack() {
 	_lastTrack = -1;
-	AudioCD.stop();
-	AudioCD.updateCD();
+	g_system->getAudioCD()->stop();
+	g_system->getAudioCD()->updateCD();
 	_driver->reset();
 }
 
@@ -4169,7 +4168,7 @@ void SoundTownsPC98_v2::loadSoundFile(Common::String file) {
 }
 
 void SoundTownsPC98_v2::process() {
-	AudioCD.updateCD();
+	g_system->getAudioCD()->updateCD();
 }
 
 void SoundTownsPC98_v2::playTrack(uint8 track) {
@@ -4206,8 +4205,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->getAudioCD()->play(trackNum+1, _driver->looping() ? -1 : 1, 0, 0);
+		g_system->getAudioCD()->updateCD();
 	} else if (_musicEnabled) {
 		_driver->cont();
 	}
@@ -4217,8 +4216,8 @@ void SoundTownsPC98_v2::playTrack(uint8 track) {
 
 void SoundTownsPC98_v2::haltTrack() {
 	_lastTrack = -1;
-	AudioCD.stop();
-	AudioCD.updateCD();
+	g_system->getAudioCD()->stop();
+	g_system->getAudioCD()->updateCD();
 	_driver->reset();
 }
 
diff --git a/engines/made/made.cpp b/engines/made/made.cpp
index 54e2189471..b4e2783fd1 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"
@@ -81,7 +80,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0)
-		_system->openCD(cd_num);
+		_system->getAudioCD()->openCD(cd_num);
 
 	_pmvPlayer = new PmvPlayer(this, _mixer);
 	_res = new ResourceReader();
@@ -129,7 +128,7 @@ MadeEngine::MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc) : Eng
 }
 
 MadeEngine::~MadeEngine() {
-	AudioCD.stop();
+	_system->getAudioCD()->stop();
 
 	delete _rnd;
 	delete _pmvPlayer;
@@ -241,7 +240,7 @@ void MadeEngine::handleEvents() {
 		}
 	}
 
-	AudioCD.updateCD();
+	_system->getAudioCD()->updateCD();
 
 }
 
diff --git a/engines/made/made.h b/engines/made/made.h
index 08f9add33d..553476540a 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 cd4081ea52..8714c45173 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 "made/made.h"
 #include "made/resource.h"
@@ -595,9 +594,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->getAudioCD()->play(argv[0] - 1, 1, 0, 0);
 	_vm->_cdTimeStart = _vm->_system->getMillis();
-	if (AudioCD.isPlaying()) {
+	if (g_system->getAudioCD()->isPlaying()) {
 		return 1;
 	} else {
 		return 0;
@@ -605,8 +604,8 @@ int16 ScriptFunctions::sfPlayCd(int16 argc, int16 *argv) {
 }
 
 int16 ScriptFunctions::sfStopCd(int16 argc, int16 *argv) {
-	if (AudioCD.isPlaying()) {
-		AudioCD.stop();
+	if (g_system->getAudioCD()->isPlaying()) {
+		g_system->getAudioCD()->stop();
 		return 1;
 	} else {
 		return 0;
@@ -614,11 +613,11 @@ int16 ScriptFunctions::sfStopCd(int16 argc, int16 *argv) {
 }
 
 int16 ScriptFunctions::sfGetCdStatus(int16 argc, int16 *argv) {
-	return AudioCD.isPlaying() ? 1 : 0;
+	return g_system->getAudioCD()->isPlaying() ? 1 : 0;
 }
 
 int16 ScriptFunctions::sfGetCdTime(int16 argc, int16 *argv) {
-	if (AudioCD.isPlaying()) {
+	if (g_system->getAudioCD()->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 22711ba167..131078a9c3 100644
--- a/engines/saga/music.h
+++ b/engines/saga/music.h
@@ -28,7 +28,7 @@
 #ifndef SAGA_MUSIC_H
 #define SAGA_MUSIC_H
 
-#include "sound/audiocd.h"
+#include "sound/mixer.h"
 #include "sound/mididrv.h"
 #include "sound/midiparser.h"
 #include "sound/decoders/mp3.h"
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 7748c0505b..4803d6d756 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -33,7 +33,6 @@
 #include "common/file.h"
 
 #include "sound/audiostream.h"
-#include "sound/audiocd.h"
 #include "sound/decoders/raw.h"
 #include "sound/decoders/wave.h"
 #include "sound/decoders/flac.h"
@@ -375,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.
-		AudioCD.play(track - 1, 1, start, duration);
+		g_system->getAudioCD()->play(track - 1, 1, start, duration);
 		return 1;
 	} else {
 		// Jones in the Fast Lane CD Audio format
@@ -398,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) {
-				AudioCD.play(1, 1, startFrame, length);
+				g_system->getAudioCD()->play(1, 1, startFrame, length);
 				_audioCdStart = g_system->getMillis();
 				break;
 			}
@@ -412,16 +411,16 @@ int AudioPlayer::audioCdPlay(int track, int start, int duration) {
 
 void AudioPlayer::audioCdStop() {
 	_audioCdStart = 0;
-	AudioCD.stop();
+	g_system->getAudioCD()->stop();
 }
 
 void AudioPlayer::audioCdUpdate() {
-	AudioCD.updateCD();
+	g_system->getAudioCD()->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->getAudioCD()->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 7bfd1de4cf..314697869c 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 7362dcd8cf..c178a883c4 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -42,7 +42,6 @@
 #include "scumm/he/sprite_he.h"
 #include "scumm/verbs.h"
 
-#include "sound/audiocd.h"
 #include "sound/mixer.h"
 
 #include "graphics/thumbnail.h"
@@ -1099,7 +1098,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)),
@@ -1371,15 +1370,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->getAudioCD()->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->getAudioCD()->play(info.track, info.numLoops, info.start, info.duration);
 	}
 
 
diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index bb50ce7bb2..e348785884 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->openCD(cd_num);
+			_system->getAudioCD()->openCD(cd_num);
 	}
 
 	// Create the sound manager
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp
index 65c50aff14..1516054679 100644
--- a/engines/scumm/sound.cpp
+++ b/engines/scumm/sound.cpp
@@ -36,7 +36,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"
@@ -87,7 +86,7 @@ Sound::Sound(ScummEngine *parent, Audio::Mixer *mixer)
 
 Sound::~Sound() {
 	stopCDTimer();
-	AudioCD.stop();
+	g_system->getAudioCD()->stop();
 	delete _sfxFile;
 }
 
@@ -1069,7 +1068,7 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
 
 	// Play it
 	if (!_soundsPaused)
-		AudioCD.play(track, numLoops, startFrame, duration);
+		g_system->getAudioCD()->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
@@ -1078,15 +1077,15 @@ void Sound::playCDTrack(int track, int numLoops, int startFrame, int duration) {
 }
 
 void Sound::stopCD() {
-	AudioCD.stop();
+	g_system->getAudioCD()->stop();
 }
 
 int Sound::pollCD() const {
-	return AudioCD.isPlaying();
+	return g_system->getAudioCD()->isPlaying();
 }
 
 void Sound::updateCD() {
-	AudioCD.updateCD();
+	g_system->getAudioCD()->updateCD();
 }
 
 void Sound::saveLoadWithSerializer(Serializer *ser) {
diff --git a/engines/teenagent/teenagent.cpp b/engines/teenagent/teenagent.cpp
index bb0e9773a2..99c79efddf 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"
 
@@ -985,7 +984,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->getAudioCD()->play(track, -1, 0, 0);
 	} else if (music->load(id))
 		music->start();
 }
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp
index cef7f0a781..0dd62dc9c4 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"
@@ -212,11 +211,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->getAudioCD()->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->getAudioCD()->isPlaying()) {
 					return true;
 				}
 			}
@@ -291,7 +290,7 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) {
  */
 bool MidiPlaying() {
 	if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) {
-		if (AudioCD.isPlaying())
+		if (g_system->getAudioCD()->isPlaying())
 			return true;
 	}
 	return _vm->_midiMusic->isPlaying();
@@ -305,7 +304,7 @@ bool StopMidi() {
 	currentLoop = false;
 
 	if (_vm->getFeatures() & GF_ENHANCED_AUDIO_SUPPORT) {
-		AudioCD.stop();
+		g_system->getAudioCD()->stop();
 	}
 
 	_vm->_midiMusic->stop();
diff --git a/engines/tinsel/tinsel.cpp b/engines/tinsel/tinsel.cpp
index 8d11efef3c..8bebd635d0 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"
@@ -854,7 +853,7 @@ TinselEngine::TinselEngine(OSystem *syst, const TinselGameDescription *gameDesc)
 
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0)
-		_system->openCD(cd_num);
+		_system->getAudioCD()->openCD(cd_num);
 
 	MidiDriverType midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB | MDT_PREFER_MIDI);
 	bool native_mt32 = ((midiDriver == MD_MT32) || ConfMan.getBool("native_mt32"));
@@ -885,7 +884,7 @@ TinselEngine::~TinselEngine() {
 	if (_bmv->MoviePlaying())
 		_bmv->FinishBMV();
 
-	AudioCD.stop();
+	_system->getAudioCD()->stop();
 	delete _bmv;
 	delete _sound;
 	delete _midiMusic;
@@ -1007,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();
-			AudioCD.updateCD();
+			_system->getAudioCD()->updateCD();
 			NextGameCycle();
 		}