diff options
| author | Paul Gilbert | 2018-05-05 10:49:11 -0400 |
|---|---|---|
| committer | GitHub | 2018-05-05 10:49:11 -0400 |
| commit | 64e29224d38dc98fd493cadaec340f241a1b0570 (patch) | |
| tree | 769ce8ab3ea3a723b31270a24cf3ace4bfcd38aa /backends/audiocd/default/default-audiocd.cpp | |
| parent | 60bff89140a2b049e81b74d218c56e5d66ac98a4 (diff) | |
| parent | f5238c66d5279bbc9de3272868b08c62adf3bbbd (diff) | |
| download | scummvm-rg350-64e29224d38dc98fd493cadaec340f241a1b0570.tar.gz scummvm-rg350-64e29224d38dc98fd493cadaec340f241a1b0570.tar.bz2 scummvm-rg350-64e29224d38dc98fd493cadaec340f241a1b0570.zip | |
Merge pull request #1177 from dreammaster/cdvoice
XEEN: Add an optional param to CD playback to specify sound type
Diffstat (limited to 'backends/audiocd/default/default-audiocd.cpp')
| -rw-r--r-- | backends/audiocd/default/default-audiocd.cpp | 5 |
1 files changed, 3 insertions, 2 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; } |