- 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

2 files changed, 6 insertions, 44 deletions

diff --git a/common/system.cpp b/common/system.cpp
index 387e0dfa0f..816d444c89 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -53,11 +53,3 @@ bool OSystem::setGraphicsMode(const char *name) {
 
 	return false;
 }
-
-bool OSystem::openCD(int drive) {
-	return false;
-}
-
-bool OSystem::pollCD() {
-	return false;
-}
diff --git a/common/system.h b/common/system.h
index 60cea49f87..8037f8f396 100644
--- a/common/system.h
+++ b/common/system.h
@@ -33,6 +33,8 @@
 
 #include "graphics/pixelformat.h"
 
+#include "backends/audiocd/abstract-audiocd.h"
+
 namespace Audio {
 	class Mixer;
 }
@@ -926,46 +928,14 @@ public:
 
 
 
-	/**
-	 * @name Audio CD
-	 * The methods in this group deal with Audio CD playback.
-	 * The default implementation simply does nothing.
-	 * This is the lower level implementation as provided by the
-	 * backends. The engines should use the Audio::AudioCDManager
-	 * class instead of using it directly.
-	 */
+	/** @name Audio CD */
 	//@{
 
 	/**
-	 * Initialise the specified CD drive for audio playback.
-	 * @return true if the CD drive was inited succesfully
-	 */
-	virtual bool openCD(int drive);
-
-	/**
-	 * Poll CD status.
-	 * @return true if CD audio is playing
-	 */
-	virtual bool pollCD();
-
-	/**
-	 * Start audio CD playback.
-	 * @param track			the track to play.
-	 * @param num_loops		how often playback should be repeated (-1 = infinitely often).
-	 * @param start_frame	the frame at which playback should start (75 frames = 1 second).
-	 * @param duration		the number of frames to play.
-	 */
-	virtual void playCD(int track, int num_loops, int start_frame, int duration) {}
-
-	/**
-	 * Stop audio CD playback.
-	 */
-	virtual void stopCD() {}
-
-	/**
-	 * Update cdrom audio status.
+	 * Return the audio cd manager. For more information, refer to the
+	 * AudioCDManager documentation.
 	 */
-	virtual void updateCD() {}
+	virtual AudioCDManager *getAudioCD() = 0;
 
 	//@}