aboutsummaryrefslogtreecommitdiff
path: root/backends/audiocd/default
diff options
context:
space:
mode:
authorPaul Gilbert2018-05-05 10:46:20 -0400
committerPaul Gilbert2018-05-05 10:46:20 -0400
commitf5238c66d5279bbc9de3272868b08c62adf3bbbd (patch)
tree769ce8ab3ea3a723b31270a24cf3ace4bfcd38aa /backends/audiocd/default
parent60bff89140a2b049e81b74d218c56e5d66ac98a4 (diff)
downloadscummvm-rg350-f5238c66d5279bbc9de3272868b08c62adf3bbbd.tar.gz
scummvm-rg350-f5238c66d5279bbc9de3272868b08c62adf3bbbd.tar.bz2
scummvm-rg350-f5238c66d5279bbc9de3272868b08c62adf3bbbd.zip
XEEN: Add an optional param to CD playback to specify sound type
Diffstat (limited to 'backends/audiocd/default')
-rw-r--r--backends/audiocd/default/default-audiocd.cpp5
-rw-r--r--backends/audiocd/default/default-audiocd.h3
2 files changed, 5 insertions, 3 deletions
diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
index c2ce7cedcc..003060c9a6 100644
--- a/backends/audiocd/default/default-audiocd.cpp
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -54,7 +54,8 @@ void DefaultAudioCDManager::close() {
stop();
}
-bool DefaultAudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate) {
+bool DefaultAudioCDManager::play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate,
+ Audio::Mixer::SoundType soundType) {
stop();
if (numLoops != 0 || startFrame != 0) {
@@ -84,7 +85,7 @@ bool DefaultAudioCDManager::play(int track, int numLoops, int startFrame, int du
repetitions. Finally, -1 means infinitely many
*/
_emulating = true;
- _mixer->playStream(Audio::Mixer::kMusicSoundType, &_handle,
+ _mixer->playStream(soundType, &_handle,
Audio::makeLoopingAudioStream(stream, start, end, (numLoops < 1) ? numLoops + 1 : numLoops), -1, _cd.volume, _cd.balance);
return true;
}
diff --git a/backends/audiocd/default/default-audiocd.h b/backends/audiocd/default/default-audiocd.h
index e3fbb4b5a1..3c12560faa 100644
--- a/backends/audiocd/default/default-audiocd.h
+++ b/backends/audiocd/default/default-audiocd.h
@@ -40,7 +40,8 @@ public:
virtual bool open();
virtual void close();
- virtual bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false);
+ virtual bool play(int track, int numLoops, int startFrame, int duration, bool onlyEmulate = false,
+ Audio::Mixer::SoundType soundType = Audio::Mixer::kMusicSoundType);
virtual void stop();
virtual bool isPlaying() const;
virtual void setVolume(byte volume);