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/sound/cdrom.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'engines/gob/sound/cdrom.cpp') 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