From 227a080e5b25762dc7a5a942dcfbfdbfcd76c372 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Tue, 20 Feb 2007 18:50:17 +0000
Subject: Patch #1663933 (Kill premix channel) with a few tiny additional
 tweaks by me

svn-id: r25752
---
 engines/sword2/sound.cpp | 4 ++--
 engines/sword2/sound.h   | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

(limited to 'engines/sword2')

diff --git a/engines/sword2/sound.cpp b/engines/sword2/sound.cpp
index b1de94f3ad..1a7cc1cee6 100644
--- a/engines/sword2/sound.cpp
+++ b/engines/sword2/sound.cpp
@@ -83,11 +83,11 @@ Sound::Sound(Sword2Engine *vm) {
 	_mixBuffer = NULL;
 	_mixBufferLen = 0;
 
-	_vm->_mixer->setupPremix(this, Audio::Mixer::kMusicSoundType);
+	_vm->_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_mixerSoundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
 }
 
 Sound::~Sound() {
-	_vm->_mixer->setupPremix(0);
+	_vm->_mixer->stopHandle(_mixerSoundHandle);
 
 	clearFxQueue(true);
 	stopMusic(true);
diff --git a/engines/sword2/sound.h b/engines/sword2/sound.h
index 8c24494148..932e557eaa 100644
--- a/engines/sword2/sound.h
+++ b/engines/sword2/sound.h
@@ -176,6 +176,7 @@ private:
 
 	Common::Mutex _mutex;
 
+	Audio::SoundHandle _mixerSoundHandle;
 	Audio::SoundHandle _leadInHandle;
 	Audio::SoundHandle _leadOutHandle;
 
-- 
cgit v1.2.3