From 5ff68b49d739d990b781102441b4473b9ff3ae2b Mon Sep 17 00:00:00 2001
From: Florian Kagerer <athrxx@users.sourceforge.net>
Date: Mon, 18 Oct 2010 21:16:58 +0000
Subject: [PATCH] FM-TOWNS AUDIO: improve thread safety

svn-id: r53589
---
 sound/softsynth/fmtowns_pc98/towns_audio.cpp        | 1 -
 sound/softsynth/fmtowns_pc98/towns_euphony.cpp      | 4 +---
 sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp  | 1 -
 sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp | 1 -
 4 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/sound/softsynth/fmtowns_pc98/towns_audio.cpp b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
index aa6df1db5a3..d745afbc170 100644
--- a/sound/softsynth/fmtowns_pc98/towns_audio.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_audio.cpp
@@ -226,7 +226,6 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac
 }
 
 TownsAudioInterface::~TownsAudioInterface() {
-	reset();
 	_ready = false;
 	deinit();
 
diff --git a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
index 7b52b4594f2..e6f94b29b51 100644
--- a/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
@@ -36,17 +36,15 @@ TownsEuphonyDriver::TownsEuphonyDriver(Audio::Mixer *mixer) : _activeChannels(0)
 }
 
 TownsEuphonyDriver::~TownsEuphonyDriver() {
+	delete _intf;
 	delete[] _activeChannels;
 	delete[] _sustainChannels;
 	delete[] _assignedChannels;
-
 	delete[] _tEnable;
 	delete[] _tMode;
 	delete[] _tOrdr;
 	delete[] _tLevel;
 	delete[] _tTranspose;
-
-	delete _intf;
 }
 
 bool TownsEuphonyDriver::init() {
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
index 8047616dbf6..303f08e6b1e 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
@@ -1053,7 +1053,6 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type)
 }
 
 TownsPC98_AudioDriver::~TownsPC98_AudioDriver() {
-	reset();
 	_ready = false;
 	deinit();
 
diff --git a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index e779812c42d..62f7d397712 100644
--- a/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -1180,7 +1180,6 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
 void TownsPC98_FmSynth::deinit() {
 	_ready = false;
 	_mixer->stopHandle(_soundHandle);
-	Common::StackLock lock(_mutex);
 	_timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback;
 }