From 4b98404d7b1f76188a0465c6e83085510567d2c6 Mon Sep 17 00:00:00 2001
From: Sylvain Dupont
Date: Fri, 22 Oct 2010 23:29:52 +0000
Subject: TOON: Close correctly sound packs

svn-id: r53720
---
 engines/toon/audio.cpp | 19 +++++++++++++++++++
 engines/toon/audio.h   |  1 +
 2 files changed, 20 insertions(+)

diff --git a/engines/toon/audio.cpp b/engines/toon/audio.cpp
index fb2eb18c0d..302e45bb5f 100644
--- a/engines/toon/audio.cpp
+++ b/engines/toon/audio.cpp
@@ -46,12 +46,18 @@ AudioManager::AudioManager(ToonEngine *vm, Audio::Mixer *mixer) : _vm(vm), _mixe
 	for (int32 i = 0; i < 16; i++)
 		_channels[i] = 0;
 
+	for (int32 i = 0; i < 4; i++) 
+		_audioPacks[i] = 0;
+
 	voiceMuted = false;
 	musicMuted = false;
 	sfxMuted = false;
 }
 
 AudioManager::~AudioManager(void) {
+	for (int32 i = 0; i < 4; i++) {
+		closeAudioPack(i);
+	}
 }
 
 void AudioManager::muteMusic(bool muted) {
@@ -181,9 +187,18 @@ void AudioManager::stopCurrentVoice() {
 		_channels[2]->stop(false);
 }
 
+
+void AudioManager::closeAudioPack(int32 id) {
+	if(_audioPacks[id]) {
+		delete _audioPacks[id];
+		_audioPacks[id] = 0;
+	}
+}
+
 bool AudioManager::loadAudioPack(int32 id, Common::String indexFile, Common::String packFile) {
 	debugC(4, kDebugAudio, "loadAudioPack(%d, %s, %s)", id, indexFile.c_str(), packFile.c_str());
 
+	closeAudioPack(id);
 	_audioPacks[id] = new AudioStreamPackage(_vm);
 	return _audioPacks[id]->loadAudioPackage(indexFile, packFile);
 }
@@ -453,6 +468,10 @@ AudioStreamPackage::AudioStreamPackage(ToonEngine *vm) : _vm(vm) {
 
 AudioStreamPackage::~AudioStreamPackage() {
 	delete[] _indexBuffer;
+	if (_file) {
+		delete _file;
+		_file = 0;
+	}
 }
 
 bool AudioStreamPackage::loadAudioPackage(Common::String indexFile, Common::String streamFile) {
diff --git a/engines/toon/audio.h b/engines/toon/audio.h
index 70d399dd1a..535e909565 100644
--- a/engines/toon/audio.h
+++ b/engines/toon/audio.h
@@ -131,6 +131,7 @@ public:
 	bool isMusicMuted() { return musicMuted; }	
 	bool isSfxMuted() { return sfxMuted; }
 
+	void closeAudioPack(int32 id);
 	bool loadAudioPack(int32 id, Common::String indexFile, Common::String packFile);
 
 	AudioStreamInstance *_channels[16];  // 0-1 : music
-- 
cgit v1.2.3