BACKENDS: Partial merge of gsoc2010-opengl: Audio CD changes only

This commit contains the AudioCDManager changes from the gsoc2010-opengl
branch. The other changes in that branch are restricted to the backends
directory only (plus configure).

The Nintendo DS and Dreamcast ports still need to be ported over to
the new Audio CD system, but that should be fairly easy to do.

svn-id: r54147

3 files changed, 6 insertions, 9 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) {