aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Horn2004-12-27 02:58:55 +0000
committerMax Horn2004-12-27 02:58:55 +0000
commit357eb38b49c47efdd11ea94f649ed900f505dcfd (patch)
tree51e57ef2120c2fbf6b35dd6fa65b99888aa8bda3
parentf15f517bb45c9ddb06178b4127f08d04204275b0 (diff)
downloadscummvm-rg350-357eb38b49c47efdd11ea94f649ed900f505dcfd.tar.gz
scummvm-rg350-357eb38b49c47efdd11ea94f649ed900f505dcfd.tar.bz2
scummvm-rg350-357eb38b49c47efdd11ea94f649ed900f505dcfd.zip
Allow premix channels to use a custom sound type
svn-id: r16332
-rw-r--r--sound/mixer.cpp4
-rw-r--r--sound/mixer.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/sound/mixer.cpp b/sound/mixer.cpp
index 76d2697586..72c5738e4f 100644
--- a/sound/mixer.cpp
+++ b/sound/mixer.cpp
@@ -136,7 +136,7 @@ bool SoundMixer::isPaused() {
return _paused;
}
-void SoundMixer::setupPremix(AudioStream *stream) {
+void SoundMixer::setupPremix(AudioStream *stream, SoundType type) {
Common::StackLock lock(_mutex);
delete _premixChannel;
@@ -146,7 +146,7 @@ void SoundMixer::setupPremix(AudioStream *stream) {
return;
// Create the channel
- _premixChannel = new Channel(this, 0, kPlainAudioDataType, stream, false);
+ _premixChannel = new Channel(this, 0, type, stream, false);
}
void SoundMixer::insertChannel(PlayingSoundHandle *handle, Channel *chan) {
diff --git a/sound/mixer.h b/sound/mixer.h
index f282825205..9fe7d3cda0 100644
--- a/sound/mixer.h
+++ b/sound/mixer.h
@@ -120,7 +120,7 @@ public:
* is not limited to it. The premix stream is invoked by the mixer whenever
* it needs to generate any data, before any other mixing takes place.
*/
- void setupPremix(AudioStream *stream);
+ void setupPremix(AudioStream *stream, SoundType type = kPlainAudioDataType);