aboutsummaryrefslogtreecommitdiff
path: root/engines/gob/sound/soundmixer.cpp
diff options
context:
space:
mode:
authorSven Hesse2008-05-08 16:15:14 +0000
committerSven Hesse2008-05-08 16:15:14 +0000
commitcb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec (patch)
tree84f76cdaf1c456b4a2e424f70d334ff2a20310f5 /engines/gob/sound/soundmixer.cpp
parent18db41db506b1e18e050e8dded44dc8501b9bc8f (diff)
downloadscummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.tar.gz
scummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.tar.bz2
scummvm-rg350-cb9fd40a1b22072ed8d6d0c81e7cf76d4ea3e4ec.zip
Declaring BackgroundAtmosphere as kMusicSoundType
svn-id: r31950
Diffstat (limited to 'engines/gob/sound/soundmixer.cpp')
-rw-r--r--engines/gob/sound/soundmixer.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/gob/sound/soundmixer.cpp b/engines/gob/sound/soundmixer.cpp
index f85073ad61..1a287d782f 100644
--- a/engines/gob/sound/soundmixer.cpp
+++ b/engines/gob/sound/soundmixer.cpp
@@ -27,7 +27,7 @@
namespace Gob {
-SoundMixer::SoundMixer(Audio::Mixer &mixer) : _mixer(&mixer) {
+SoundMixer::SoundMixer(Audio::Mixer &mixer, Audio::Mixer::SoundType type) : _mixer(&mixer) {
_playingSound = 0;
_rate = _mixer->getOutputRate();
@@ -50,8 +50,7 @@ SoundMixer::SoundMixer(Audio::Mixer &mixer) : _mixer(&mixer) {
_fadeSamples = 0;
_curFadeSamples = 0;
- _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_handle,
- this, -1, 255, 0, false, true);
+ _mixer->playInputStream(type, &_handle, this, -1, 255, 0, false, true);
}
SoundMixer::~SoundMixer() {