From e991cd8c53ad21af037df1e0a16816aeea2d0fe2 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 9 Jun 2010 20:09:57 +0000
Subject: - 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
---
 engines/gob/gob.cpp         | 2 +-
 engines/gob/sound/cdrom.cpp | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

(limited to 'engines/gob')

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;
 }
 
-- 
cgit v1.2.3


From e1ef3cd9fc059ebe8c606d330173bc3f71f8dce7 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Tue, 15 Jun 2010 04:13:12 +0000
Subject: Renamed getAudioCD to getAudioCDManager.

svn-id: r49678
---
 engines/gob/gob.cpp         | 2 +-
 engines/gob/sound/cdrom.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'engines/gob')

diff --git a/engines/gob/gob.cpp b/engines/gob/gob.cpp
index 5dc2da6e0c..d36a1c65c9 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->getAudioCD()->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 ed006ca722..ec7da29fdb 100644
--- a/engines/gob/sound/cdrom.cpp
+++ b/engines/gob/sound/cdrom.cpp
@@ -115,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
-	g_system->getAudioCD()->play(1, 1, from, to - from + 1);
+	g_system->getAudioCDManager()->play(1, 1, from, to - from + 1);
 	_cdPlaying = true;
 }
 
@@ -160,7 +160,7 @@ void CDROM::stopPlaying() {
 
 void CDROM::stop() {
 	_curTrackBuffer = 0;
-	g_system->getAudioCD()->stop();
+	g_system->getAudioCDManager()->stop();
 	_cdPlaying = false;
 }
 
-- 
cgit v1.2.3