From 3e6a1422e31f9ccdc6f6acd7def9e246d1b6f0e6 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 30 Oct 2013 08:30:55 +0100
Subject: TOON: Fix CID 1002728, 1002729, 1003215, 1002731, 1002730

---
 engines/toon/audio.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'engines/toon/audio.cpp')

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index bc0e051057..50b559ee00 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -255,6 +255,8 @@ AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer,
 	} else {
 		stopNow();
 	}
+
+	_soundType = Audio::Mixer::kPlainSoundType;
 }
 
 AudioStreamInstance::~AudioStreamInstance() {
-- 
cgit v1.2.3


From c177d450733c014dd8e5e3c25dadf04484433cc8 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Sat, 9 Nov 2013 15:09:05 +0100
Subject: TOON: Fix uninitialized variable in audio. CID 1002729

---
 engines/toon/audio.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'engines/toon/audio.cpp')

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index 50b559ee00..303f6774fa 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -228,6 +228,7 @@ void AudioManager::stopMusic() {
 AudioStreamInstance::AudioStreamInstance(AudioManager *man, Audio::Mixer *mixer, Common::SeekableReadStream *stream , bool looping, bool deleteFileStreamAtEnd) {
 	_compBufferSize = 0;
 	_buffer = NULL;
+	_bufferSize = 0;
 	_bufferMaxSize = 0;
 	_mixer = mixer;
 	_compBuffer = NULL;
-- 
cgit v1.2.3


From 1d65a915ba31a11d1f2c9e7ce1c62006f9a359b0 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 18 Feb 2014 02:34:26 +0100
Subject: TOON: Make GPL headers consistent in themselves.

---
 engines/toon/audio.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'engines/toon/audio.cpp')

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index 303f6774fa..82544375d5 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -8,12 +8,12 @@
  * modify it under the terms of the GNU General Public License
  * as published by the Free Software Foundation; either version 2
  * of the License, or (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-- 
cgit v1.2.3