From 9f2358612a934de87ac9787effba11dd8b2b925b Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 9 Jun 2010 05:39:27 +0000
Subject: Created DefaultAudioCDManager and SdlAudioCDManager

svn-id: r49532
---
 backends/audiocd/default/default-audiocd.cpp | 124 ++++++++++++++++++++++++
 backends/audiocd/default/default-audiocd.h   |  68 ++++++++++++++
 backends/audiocd/sdl/sdl-audiocd.cpp         | 135 +++++++++++++++++++++++++++
 backends/audiocd/sdl/sdl-audiocd.h           |  54 +++++++++++
 4 files changed, 381 insertions(+)
 create mode 100644 backends/audiocd/default/default-audiocd.cpp
 create mode 100644 backends/audiocd/default/default-audiocd.h
 create mode 100644 backends/audiocd/sdl/sdl-audiocd.cpp
 create mode 100644 backends/audiocd/sdl/sdl-audiocd.h

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
new file mode 100644
index 0000000000..ebe5553611
--- /dev/null
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -0,0 +1,124 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "backends/audiocd/default/default-audiocd.h"
+#include "sound/audiostream.h"
+#include "common/util.h"
+#include "common/system.h"
+
+DefaultAudioCDManager::DefaultAudioCDManager() {
+	_cd.playing = false;
+	_cd.track = 0;
+	_cd.start = 0;
+	_cd.duration = 0;
+	_cd.numLoops = 0;
+	_mixer = g_system->getMixer();
+	_emulating = false;
+	assert(_mixer);
+}
+
+void DefaultAudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool only_emulate) {
+	if (numLoops != 0 || startFrame != 0) {
+		_cd.track = track;
+		_cd.numLoops = numLoops;
+		_cd.start = startFrame;
+		_cd.duration = duration;
+
+		// Try to load the track from a compressed data file, and if found, use
+		// that. If not found, attempt to start regular Audio CD playback of
+		// the requested track.
+		char trackName[2][16];
+		sprintf(trackName[0], "track%d", track);
+		sprintf(trackName[1], "track%02d", track);
+		Audio::SeekableAudioStream *stream = 0;
+
+		for (int i = 0; !stream && i < 2; ++i)
+			stream = Audio::SeekableAudioStream::openStreamFile(trackName[i]);
+
+		// Stop any currently playing emulated track
+		_mixer->stopHandle(_handle);
+
+		if (stream != 0) {
+			Audio::Timestamp start = Audio::Timestamp(0, startFrame, 75);
+			Audio::Timestamp end = duration ? Audio::Timestamp(0, startFrame + duration, 75) : stream->getLength();
+
+			/*
+			FIXME: Seems numLoops == 0 and numLoops == 1 both indicate a single repetition,
+			while all other positive numbers indicate precisely the number of desired
+			repetitions. Finally, -1 means infinitely many
+			*/
+			_emulating = true;
+			_mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle,
+			                        Audio::makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops));
+		} else {
+			_emulating = false;
+			if (!only_emulate)
+				playCD(track, numLoops, startFrame, duration);
+		}
+	}
+}
+
+void DefaultAudioCDManager::stop() {
+	if (_emulating) {
+		// Audio CD emulation
+		_mixer->stopHandle(_handle);
+		_emulating = false;
+	} else {
+		// Real Audio CD
+		stopCD();
+	}
+}
+
+bool DefaultAudioCDManager::isPlaying() const {
+	if (_emulating) {
+		// Audio CD emulation
+		return _mixer->isSoundHandleActive(_handle);
+	} else {
+		// Real Audio CD
+		return pollCD();
+	}
+}
+
+void DefaultAudioCDManager::update() {
+	if (_emulating) {
+		// Check whether the audio track stopped playback
+		if (!_mixer->isSoundHandleActive(_handle)) {
+			// FIXME: We do not update the numLoops parameter here (and in fact,
+			// currently can't do that). Luckily, only one engine ever checks
+			// this part of the AudioCD status, namely the SCUMM engine; and it
+			// only checks whether the track is currently set to infinite looping
+			// or not.
+			_emulating = false;
+		}
+	} else {
+		updateCD();
+	}
+}
+
+DefaultAudioCDManager::Status DefaultAudioCDManager::getStatus() const {
+	Status info = _cd;
+	info.playing = isPlaying();
+	return info;
+}
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
new file mode 100644
index 0000000000..0680b4fd65
--- /dev/null
+++ b/backends/audiocd/default/default-audiocd.h
@@ -0,0 +1,68 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_AUDIOCD_DEFAULT_H
+#define BACKENDS_AUDIOCD_DEFAULT_H
+
+#include "common/noncopyable.h"
+#include "sound/mixer.h"
+
+class DefaultAudioCDManager : Common::NonCopyable {
+public:
+	DefaultAudioCDManager();
+	virtual ~DefaultAudioCDManager() {}
+
+	struct Status {
+		bool playing;
+		int track;
+		int start;
+		int duration;
+		int numLoops;
+	};
+
+	// Emulated CD functions, engines should call this functions
+	void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false);
+	void stop();
+	bool isPlaying() const;
+	void update();
+	virtual Status getStatus() const; // Subclasses should override for better status results
+
+protected:
+
+	// Real CD functions. Let Subclasses implement the real code
+	virtual bool openCD(int drive) { return false; }
+	virtual void updateCD() {}
+	virtual bool pollCD() const { return false; }
+	virtual void playCD(int track, int num_loops, int start_frame, int duration) {}
+	virtual void stopCD() {}
+
+	Audio::SoundHandle _handle;
+	bool _emulating;
+
+	Status _cd;
+	Audio::Mixer *_mixer;
+};
+
+#endif
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
new file mode 100644
index 0000000000..7668bb80f5
--- /dev/null
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -0,0 +1,135 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
+
+#include "backends/audiocd/sdl/sdl-audiocd.h"
+
+SdlAudioCDManager::SdlAudioCDManager()
+	:
+	_cdrom(0),
+	_cdTrack(0),
+	_cdNumLoops(0),
+	_cdStartFrame(0),
+	_cdDuration(0),
+	_cdEndTime(0),
+	_cdStopTime(0) {
+
+}
+
+SdlAudioCDManager::~SdlAudioCDManager() {
+	if (_cdrom) {
+		SDL_CDStop(_cdrom);
+		SDL_CDClose(_cdrom);
+	}
+}
+
+bool SdlAudioCDManager::openCD(int drive) {
+	if (SDL_InitSubSystem(SDL_INIT_CDROM) == -1)
+		_cdrom = NULL;
+	else {
+		_cdrom = SDL_CDOpen(drive);
+		// Did it open? Check if _cdrom is NULL
+		if (!_cdrom) {
+			warning("Couldn't open drive: %s", SDL_GetError());
+		} else {
+			_cdNumLoops = 0;
+			_cdStopTime = 0;
+			_cdEndTime = 0;
+		}
+	}
+
+	return (_cdrom != NULL);
+}
+
+void SdlAudioCDManager::stopCD() {	/* Stop CD Audio in 1/10th of a second */
+	_cdStopTime = SDL_GetTicks() + 100;
+	_cdNumLoops = 0;
+}
+
+void SdlAudioCDManager::playCD(int track, int num_loops, int start_frame, int duration) {
+	if (!num_loops && !start_frame)
+		return;
+
+	if (!_cdrom)
+		return;
+
+	if (duration > 0)
+		duration += 5;
+
+	_cdTrack = track;
+	_cdNumLoops = num_loops;
+	_cdStartFrame = start_frame;
+
+	SDL_CDStatus(_cdrom);
+	if (start_frame == 0 && duration == 0)
+		SDL_CDPlayTracks(_cdrom, track, 0, 1, 0);
+	else
+		SDL_CDPlayTracks(_cdrom, track, start_frame, 0, duration);
+	_cdDuration = duration;
+	_cdStopTime = 0;
+	_cdEndTime = SDL_GetTicks() + _cdrom->track[track].length * 1000 / CD_FPS;
+}
+
+bool SdlAudioCDManager::pollCD() const {
+	if (!_cdrom)
+		return false;
+
+	return (_cdNumLoops != 0 && (SDL_GetTicks() < _cdEndTime || SDL_CDStatus(_cdrom) == CD_PLAYING));
+}
+
+void SdlAudioCDManager::updateCD() {
+	if (!_cdrom)
+		return;
+
+	if (_cdStopTime != 0 && SDL_GetTicks() >= _cdStopTime) {
+		SDL_CDStop(_cdrom);
+		_cdNumLoops = 0;
+		_cdStopTime = 0;
+		return;
+	}
+
+	if (_cdNumLoops == 0 || SDL_GetTicks() < _cdEndTime)
+		return;
+
+	if (_cdNumLoops != 1 && SDL_CDStatus(_cdrom) != CD_STOPPED) {
+		// Wait another second for it to be done
+		_cdEndTime += 1000;
+		return;
+	}
+
+	if (_cdNumLoops > 0)
+		_cdNumLoops--;
+
+	if (_cdNumLoops != 0) {
+		if (_cdStartFrame == 0 && _cdDuration == 0)
+			SDL_CDPlayTracks(_cdrom, _cdTrack, 0, 1, 0);
+		else
+			SDL_CDPlayTracks(_cdrom, _cdTrack, _cdStartFrame, 0, _cdDuration);
+		_cdEndTime = SDL_GetTicks() + _cdrom->track[_cdTrack].length * 1000 / CD_FPS;
+	}
+}
+
+#endif
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
new file mode 100644
index 0000000000..1681f65d2e
--- /dev/null
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -0,0 +1,54 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_AUDIOCD_SDL_H
+#define BACKENDS_AUDIOCD_SDL_H
+
+#include "backends/audiocd/default/default-audiocd.h"
+
+#if defined(__SYMBIAN32__)
+#include <esdl\SDL.h>
+#else
+#include <SDL.h>
+#endif
+
+class SdlAudioCDManager : DefaultAudioCDManager {
+public:
+	SdlAudioCDManager();
+	~SdlAudioCDManager();
+
+protected:
+	bool openCD(int drive);
+	void updateCD();
+	bool pollCD() const;
+	void playCD(int track, int num_loops, int start_frame, int duration);
+	void stopCD();
+
+	SDL_CD *_cdrom;
+	int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration;
+	uint32 _cdEndTime, _cdStopTime;
+};
+
+#endif
-- 
cgit v1.2.3


From 4177a1e16df7712c081e41a8eabf0b7d4694230b Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 9 Jun 2010 18:51:55 +0000
Subject: Added an abstract version of AudioCDManager.

svn-id: r49547
---
 backends/audiocd/abstract-audiocd.h        | 50 ++++++++++++++++++++++++++++++
 backends/audiocd/default/default-audiocd.h | 12 ++-----
 2 files changed, 52 insertions(+), 10 deletions(-)
 create mode 100644 backends/audiocd/abstract-audiocd.h

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/abstract-audiocd.h b/backends/audiocd/abstract-audiocd.h
new file mode 100644
index 0000000000..7d61c0092b
--- /dev/null
+++ b/backends/audiocd/abstract-audiocd.h
@@ -0,0 +1,50 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_AUDIOCD_ABSTRACT_H
+#define BACKENDS_AUDIOCD_ABSTRACT_H
+
+#include "common/noncopyable.h"
+
+class AudioCDManager : Common::NonCopyable {
+public:
+	virtual ~AudioCDManager() {}
+
+	struct Status {
+		bool playing;
+		int track;
+		int start;
+		int duration;
+		int numLoops;
+	};
+
+	virtual void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false) = 0;
+	virtual void stop() = 0;
+	virtual bool isPlaying() const = 0;
+	virtual void update() = 0;
+	virtual Status getStatus() const = 0;
+};
+
+#endif
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 0680b4fd65..5125f4e4e8 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -26,22 +26,14 @@
 #ifndef BACKENDS_AUDIOCD_DEFAULT_H
 #define BACKENDS_AUDIOCD_DEFAULT_H
 
-#include "common/noncopyable.h"
+#include "backends/audiocd/abstract-audiocd.h"
 #include "sound/mixer.h"
 
-class DefaultAudioCDManager : Common::NonCopyable {
+class DefaultAudioCDManager : AudioCDManager {
 public:
 	DefaultAudioCDManager();
 	virtual ~DefaultAudioCDManager() {}
 
-	struct Status {
-		bool playing;
-		int track;
-		int start;
-		int duration;
-		int numLoops;
-	};
-
 	// Emulated CD functions, engines should call this functions
 	void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false);
 	void stop();
-- 
cgit v1.2.3


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
---
 backends/audiocd/abstract-audiocd.h        | 8 ++++++++
 backends/audiocd/default/default-audiocd.h | 5 +----
 2 files changed, 9 insertions(+), 4 deletions(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/abstract-audiocd.h b/backends/audiocd/abstract-audiocd.h
index 7d61c0092b..07d428fce6 100644
--- a/backends/audiocd/abstract-audiocd.h
+++ b/backends/audiocd/abstract-audiocd.h
@@ -40,11 +40,19 @@ public:
 		int numLoops;
 	};
 
+	// Emulated CD functions, engines should call these functions
 	virtual void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false) = 0;
 	virtual void stop() = 0;
 	virtual bool isPlaying() const = 0;
 	virtual void update() = 0;
 	virtual Status getStatus() const = 0;
+
+	// Real CD functions. Let Subclasses implement the real code
+	virtual bool openCD(int drive) { return false; }
+	virtual void updateCD() {}
+	virtual bool pollCD() const { return false; }
+	virtual void playCD(int track, int num_loops, int start_frame, int duration) {}
+	virtual void stopCD() {}
 };
 
 #endif
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 5125f4e4e8..af75572788 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -34,22 +34,19 @@ public:
 	DefaultAudioCDManager();
 	virtual ~DefaultAudioCDManager() {}
 
-	// Emulated CD functions, engines should call this functions
 	void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false);
 	void stop();
 	bool isPlaying() const;
 	void update();
 	virtual Status getStatus() const; // Subclasses should override for better status results
 
-protected:
-
-	// Real CD functions. Let Subclasses implement the real code
 	virtual bool openCD(int drive) { return false; }
 	virtual void updateCD() {}
 	virtual bool pollCD() const { return false; }
 	virtual void playCD(int track, int num_loops, int start_frame, int duration) {}
 	virtual void stopCD() {}
 
+protected:
 	Audio::SoundHandle _handle;
 	bool _emulating;
 
-- 
cgit v1.2.3


From 33c36f3c7ce457ca6397e85682a864e37e6c5c7b Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Thu, 10 Jun 2010 02:08:08 +0000
Subject: Commented AudioCDManager

svn-id: r49554
---
 backends/audiocd/abstract-audiocd.h | 90 +++++++++++++++++++++++++++++++++----
 1 file changed, 82 insertions(+), 8 deletions(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/abstract-audiocd.h b/backends/audiocd/abstract-audiocd.h
index 07d428fce6..41634b38fb 100644
--- a/backends/audiocd/abstract-audiocd.h
+++ b/backends/audiocd/abstract-audiocd.h
@@ -28,10 +28,15 @@
 
 #include "common/noncopyable.h"
 
+/**
+* Abstract Audio CD manager class. Private subclasses implement the actual
+* functionality.
+*/
 class AudioCDManager : Common::NonCopyable {
 public:
 	virtual ~AudioCDManager() {}
 
+
 	struct Status {
 		bool playing;
 		int track;
@@ -40,19 +45,88 @@ public:
 		int numLoops;
 	};
 
-	// Emulated CD functions, engines should call these functions
+	/**
+	 * @name Emulated playback functions
+	 * Engines should call these functions. Not all platforms
+	 * support cd playback, and these functions should try to
+	 * emulate it.
+	 */
+	//@{
+
+	/**
+	 * 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.
+	 * @param only_emulate	determines if the track should be emulated only
+	 */
 	virtual void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false) = 0;
-	virtual void stop() = 0;
+
+	/**
+	 * Get if audio is being played.
+	 * @return true if CD or emulated audio is playing
+	 */
 	virtual bool isPlaying() const = 0;
+
+	/**
+	 * Stop CD or emulated audio playback.
+	 */
+	virtual void stop() = 0;
+
+	/**
+	 * Update CD or emulated audio status.
+	 */
 	virtual void update() = 0;
+
+	/**
+	 * Get the playback status.
+	 * @return a Status struct with playback data.
+	 */
 	virtual Status getStatus() const = 0;
 
-	// Real CD functions. Let Subclasses implement the real code
-	virtual bool openCD(int drive) { return false; }
-	virtual void updateCD() {}
-	virtual bool pollCD() const { return false; }
-	virtual void playCD(int track, int num_loops, int start_frame, int duration) {}
-	virtual void stopCD() {}
+	//@}
+
+
+	/**
+	 * @name Real CD audio methods
+	 * These functions should be called from the emulated
+	 * ones if they can't emulate the audio playback.
+	 */
+	//@{
+
+	/**
+	 * Initialise the specified CD drive for audio playback.
+	 * @return true if the CD drive was inited succesfully
+	 */
+	virtual bool openCD(int drive) = 0;
+	
+	/**
+	 * Poll CD status.
+	 * @return true if CD audio is playing
+	 */
+	virtual bool pollCD() const = 0;
+
+	/**
+	 * Start CD audio 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) = 0;
+
+	/**
+	 * Stop CD audio playback.
+	 */
+	virtual void stopCD() = 0;
+
+	/**
+	 * Update CD audio status.
+	 */
+	virtual void updateCD() = 0;
+
+	//@}
 };
 
 #endif
-- 
cgit v1.2.3


From 6a52a168eeb54938c757d3be560f7ba8b30aa7c0 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Tue, 15 Jun 2010 03:49:20 +0000
Subject: Renamed abstract Manager files.

svn-id: r49677
---
 backends/audiocd/abstract-audiocd.h        | 132 -----------------------------
 backends/audiocd/audiocd.h                 | 132 +++++++++++++++++++++++++++++
 backends/audiocd/default/default-audiocd.h |   2 +-
 3 files changed, 133 insertions(+), 133 deletions(-)
 delete mode 100644 backends/audiocd/abstract-audiocd.h
 create mode 100644 backends/audiocd/audiocd.h

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/abstract-audiocd.h b/backends/audiocd/abstract-audiocd.h
deleted file mode 100644
index 41634b38fb..0000000000
--- a/backends/audiocd/abstract-audiocd.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * $URL$
- * $Id$
- *
- */
-
-#ifndef BACKENDS_AUDIOCD_ABSTRACT_H
-#define BACKENDS_AUDIOCD_ABSTRACT_H
-
-#include "common/noncopyable.h"
-
-/**
-* Abstract Audio CD manager class. Private subclasses implement the actual
-* functionality.
-*/
-class AudioCDManager : Common::NonCopyable {
-public:
-	virtual ~AudioCDManager() {}
-
-
-	struct Status {
-		bool playing;
-		int track;
-		int start;
-		int duration;
-		int numLoops;
-	};
-
-	/**
-	 * @name Emulated playback functions
-	 * Engines should call these functions. Not all platforms
-	 * support cd playback, and these functions should try to
-	 * emulate it.
-	 */
-	//@{
-
-	/**
-	 * 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.
-	 * @param only_emulate	determines if the track should be emulated only
-	 */
-	virtual void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false) = 0;
-
-	/**
-	 * Get if audio is being played.
-	 * @return true if CD or emulated audio is playing
-	 */
-	virtual bool isPlaying() const = 0;
-
-	/**
-	 * Stop CD or emulated audio playback.
-	 */
-	virtual void stop() = 0;
-
-	/**
-	 * Update CD or emulated audio status.
-	 */
-	virtual void update() = 0;
-
-	/**
-	 * Get the playback status.
-	 * @return a Status struct with playback data.
-	 */
-	virtual Status getStatus() const = 0;
-
-	//@}
-
-
-	/**
-	 * @name Real CD audio methods
-	 * These functions should be called from the emulated
-	 * ones if they can't emulate the audio playback.
-	 */
-	//@{
-
-	/**
-	 * Initialise the specified CD drive for audio playback.
-	 * @return true if the CD drive was inited succesfully
-	 */
-	virtual bool openCD(int drive) = 0;
-	
-	/**
-	 * Poll CD status.
-	 * @return true if CD audio is playing
-	 */
-	virtual bool pollCD() const = 0;
-
-	/**
-	 * Start CD audio 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) = 0;
-
-	/**
-	 * Stop CD audio playback.
-	 */
-	virtual void stopCD() = 0;
-
-	/**
-	 * Update CD audio status.
-	 */
-	virtual void updateCD() = 0;
-
-	//@}
-};
-
-#endif
diff --git a/backends/audiocd/audiocd.h b/backends/audiocd/audiocd.h
new file mode 100644
index 0000000000..41634b38fb
--- /dev/null
+++ b/backends/audiocd/audiocd.h
@@ -0,0 +1,132 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#ifndef BACKENDS_AUDIOCD_ABSTRACT_H
+#define BACKENDS_AUDIOCD_ABSTRACT_H
+
+#include "common/noncopyable.h"
+
+/**
+* Abstract Audio CD manager class. Private subclasses implement the actual
+* functionality.
+*/
+class AudioCDManager : Common::NonCopyable {
+public:
+	virtual ~AudioCDManager() {}
+
+
+	struct Status {
+		bool playing;
+		int track;
+		int start;
+		int duration;
+		int numLoops;
+	};
+
+	/**
+	 * @name Emulated playback functions
+	 * Engines should call these functions. Not all platforms
+	 * support cd playback, and these functions should try to
+	 * emulate it.
+	 */
+	//@{
+
+	/**
+	 * 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.
+	 * @param only_emulate	determines if the track should be emulated only
+	 */
+	virtual void play(int track, int numLoops, int startFrame, int duration, bool only_emulate = false) = 0;
+
+	/**
+	 * Get if audio is being played.
+	 * @return true if CD or emulated audio is playing
+	 */
+	virtual bool isPlaying() const = 0;
+
+	/**
+	 * Stop CD or emulated audio playback.
+	 */
+	virtual void stop() = 0;
+
+	/**
+	 * Update CD or emulated audio status.
+	 */
+	virtual void update() = 0;
+
+	/**
+	 * Get the playback status.
+	 * @return a Status struct with playback data.
+	 */
+	virtual Status getStatus() const = 0;
+
+	//@}
+
+
+	/**
+	 * @name Real CD audio methods
+	 * These functions should be called from the emulated
+	 * ones if they can't emulate the audio playback.
+	 */
+	//@{
+
+	/**
+	 * Initialise the specified CD drive for audio playback.
+	 * @return true if the CD drive was inited succesfully
+	 */
+	virtual bool openCD(int drive) = 0;
+	
+	/**
+	 * Poll CD status.
+	 * @return true if CD audio is playing
+	 */
+	virtual bool pollCD() const = 0;
+
+	/**
+	 * Start CD audio 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) = 0;
+
+	/**
+	 * Stop CD audio playback.
+	 */
+	virtual void stopCD() = 0;
+
+	/**
+	 * Update CD audio status.
+	 */
+	virtual void updateCD() = 0;
+
+	//@}
+};
+
+#endif
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index af75572788..4669382a53 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -26,7 +26,7 @@
 #ifndef BACKENDS_AUDIOCD_DEFAULT_H
 #define BACKENDS_AUDIOCD_DEFAULT_H
 
-#include "backends/audiocd/abstract-audiocd.h"
+#include "backends/audiocd/audiocd.h"
 #include "sound/mixer.h"
 
 class DefaultAudioCDManager : AudioCDManager {
-- 
cgit v1.2.3


From 04dce6a10646d1060813c90c9270be46c36c02cd Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Wed, 23 Jun 2010 19:34:07 +0000
Subject: Fixed AudioCDManager not having a public inheritance. Backend code
 cleanup.

svn-id: r50189
---
 backends/audiocd/default/default-audiocd.h | 2 +-
 backends/audiocd/sdl/sdl-audiocd.h         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 4669382a53..5b946a0793 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -29,7 +29,7 @@
 #include "backends/audiocd/audiocd.h"
 #include "sound/mixer.h"
 
-class DefaultAudioCDManager : AudioCDManager {
+class DefaultAudioCDManager : public AudioCDManager {
 public:
 	DefaultAudioCDManager();
 	virtual ~DefaultAudioCDManager() {}
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
index 1681f65d2e..ed3d777c57 100644
--- a/backends/audiocd/sdl/sdl-audiocd.h
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -34,7 +34,7 @@
 #include <SDL.h>
 #endif
 
-class SdlAudioCDManager : DefaultAudioCDManager {
+class SdlAudioCDManager : public DefaultAudioCDManager {
 public:
 	SdlAudioCDManager();
 	~SdlAudioCDManager();
-- 
cgit v1.2.3


From f9c3a4547cbf1b1942402d618fa403a7fb1cb656 Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Fri, 2 Jul 2010 06:44:42 +0000
Subject: Cleanup and documentation.

svn-id: r50589
---
 backends/audiocd/audiocd.h                   |  7 +++++--
 backends/audiocd/default/default-audiocd.cpp |  1 -
 backends/audiocd/default/default-audiocd.h   |  3 +++
 backends/audiocd/sdl/sdl-audiocd.cpp         |  3 ++-
 backends/audiocd/sdl/sdl-audiocd.h           | 15 +++++++++------
 5 files changed, 19 insertions(+), 10 deletions(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/audiocd.h b/backends/audiocd/audiocd.h
index 41634b38fb..70eabf650b 100644
--- a/backends/audiocd/audiocd.h
+++ b/backends/audiocd/audiocd.h
@@ -29,14 +29,16 @@
 #include "common/noncopyable.h"
 
 /**
-* Abstract Audio CD manager class. Private subclasses implement the actual
+* Abstract Audio CD manager class. Subclasses implement the actual
 * functionality.
 */
 class AudioCDManager : Common::NonCopyable {
 public:
 	virtual ~AudioCDManager() {}
 
-
+	/**
+	* A structure containing the current playback information
+	*/
 	struct Status {
 		bool playing;
 		int track;
@@ -97,6 +99,7 @@ public:
 
 	/**
 	 * Initialise the specified CD drive for audio playback.
+	 * @param drive the drive id
 	 * @return true if the CD drive was inited succesfully
 	 */
 	virtual bool openCD(int drive) = 0;
diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
index ebe5553611..0e7dc66ba1 100644
--- a/backends/audiocd/default/default-audiocd.cpp
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -25,7 +25,6 @@
 
 #include "backends/audiocd/default/default-audiocd.h"
 #include "sound/audiostream.h"
-#include "common/util.h"
 #include "common/system.h"
 
 DefaultAudioCDManager::DefaultAudioCDManager() {
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 5b946a0793..474264ef07 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -29,6 +29,9 @@
 #include "backends/audiocd/audiocd.h"
 #include "sound/mixer.h"
 
+/**
+* The default audio cd manager. Implements emulation of audio cd playback.
+*/
 class DefaultAudioCDManager : public AudioCDManager {
 public:
 	DefaultAudioCDManager();
diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index 7668bb80f5..d032df7eac 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -64,7 +64,8 @@ bool SdlAudioCDManager::openCD(int drive) {
 	return (_cdrom != NULL);
 }
 
-void SdlAudioCDManager::stopCD() {	/* Stop CD Audio in 1/10th of a second */
+void SdlAudioCDManager::stopCD() {
+	// Stop CD Audio in 1/10th of a second
 	_cdStopTime = SDL_GetTicks() + 100;
 	_cdNumLoops = 0;
 }
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
index ed3d777c57..cb88d31a56 100644
--- a/backends/audiocd/sdl/sdl-audiocd.h
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -34,17 +34,20 @@
 #include <SDL.h>
 #endif
 
+/**
+* The SDL audio cd manager. Implements real audio cd playback.
+*/
 class SdlAudioCDManager : public DefaultAudioCDManager {
 public:
 	SdlAudioCDManager();
-	~SdlAudioCDManager();
+	virtual ~SdlAudioCDManager();
 
 protected:
-	bool openCD(int drive);
-	void updateCD();
-	bool pollCD() const;
-	void playCD(int track, int num_loops, int start_frame, int duration);
-	void stopCD();
+	virtual bool openCD(int drive);
+	virtual void updateCD();
+	virtual bool pollCD() const;
+	virtual void playCD(int track, int num_loops, int start_frame, int duration);
+	virtual void stopCD();
 
 	SDL_CD *_cdrom;
 	int _cdTrack, _cdNumLoops, _cdStartFrame, _cdDuration;
-- 
cgit v1.2.3


From fda9416cc8b64fa7371b7a9989def9cc318efc7e Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Sat, 3 Jul 2010 00:13:45 +0000
Subject: Cleanup and documentation.

svn-id: r50609
---
 backends/audiocd/default/default-audiocd.h | 4 ++--
 backends/audiocd/sdl/sdl-audiocd.h         | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index 474264ef07..ec209d9eb5 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -30,8 +30,8 @@
 #include "sound/mixer.h"
 
 /**
-* The default audio cd manager. Implements emulation of audio cd playback.
-*/
+ * The default audio cd manager. Implements emulation of audio cd playback.
+ */
 class DefaultAudioCDManager : public AudioCDManager {
 public:
 	DefaultAudioCDManager();
diff --git a/backends/audiocd/sdl/sdl-audiocd.h b/backends/audiocd/sdl/sdl-audiocd.h
index cb88d31a56..42ac980c51 100644
--- a/backends/audiocd/sdl/sdl-audiocd.h
+++ b/backends/audiocd/sdl/sdl-audiocd.h
@@ -35,8 +35,8 @@
 #endif
 
 /**
-* The SDL audio cd manager. Implements real audio cd playback.
-*/
+ * The SDL audio cd manager. Implements real audio cd playback.
+ */
 class SdlAudioCDManager : public DefaultAudioCDManager {
 public:
 	SdlAudioCDManager();
-- 
cgit v1.2.3


From 2e55bcf383fcc860963a29678005735ff76724ad Mon Sep 17 00:00:00 2001
From: Lars Persson
Date: Sun, 1 Aug 2010 19:40:46 +0000
Subject: SYMBIAN platform. Correct building of SDL refacturing for Symbian.

svn-id: r51587
---
 backends/audiocd/sdl/sdl-audiocd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index d032df7eac..4035f4ed41 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(WIN32) || defined(UNIX) || defined(MACOSX)
+#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(__SYMBIAN32__)
 
 #include "backends/audiocd/sdl/sdl-audiocd.h"
 
-- 
cgit v1.2.3


From 58d256c15e2622b5344628d1d0ac53a28e44d0ab Mon Sep 17 00:00:00 2001
From: Alejandro Marzini
Date: Thu, 12 Aug 2010 06:30:26 +0000
Subject: SDL: Make use of SDL_BACKEND instead of platform specific defines.

svn-id: r52029
---
 backends/audiocd/sdl/sdl-audiocd.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'backends/audiocd')

diff --git a/backends/audiocd/sdl/sdl-audiocd.cpp b/backends/audiocd/sdl/sdl-audiocd.cpp
index 4035f4ed41..b906a3786f 100644
--- a/backends/audiocd/sdl/sdl-audiocd.cpp
+++ b/backends/audiocd/sdl/sdl-audiocd.cpp
@@ -23,7 +23,7 @@
  *
  */
 
-#if defined(WIN32) || defined(UNIX) || defined(MACOSX) || defined(__SYMBIAN32__)
+#if defined(SDL_BACKEND)
 
 #include "backends/audiocd/sdl/sdl-audiocd.h"
 
-- 
cgit v1.2.3