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 +++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 backends/audiocd/default/default-audiocd.cpp create mode 100644 backends/audiocd/default/default-audiocd.h (limited to 'backends/audiocd/default') 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 -- 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/default/default-audiocd.h | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'backends/audiocd/default') 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/default/default-audiocd.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'backends/audiocd/default') 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 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/default/default-audiocd.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/audiocd/default') 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 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/audiocd/default') 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() {} -- 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/default/default-audiocd.cpp | 1 - backends/audiocd/default/default-audiocd.h | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'backends/audiocd/default') 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(); -- 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 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/audiocd/default') 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(); -- cgit v1.2.3