[Scummvm-cvs-logs] SF.net SVN: scummvm:[53589] scummvm/trunk/sound/softsynth/fmtowns_pc98

[athrxx at users.sourceforge.net]

Revision: 53589
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53589&view=rev
Author:   athrxx
Date:     2010-10-18 21:16:58 +0000 (Mon, 18 Oct 2010)

Log Message:
-----------
FM-TOWNS AUDIO: improve thread safety

Modified Paths:
--------------
    scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp
    scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
    scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
    scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp

Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp	2010-10-18 21:03:28 UTC (rev 53588)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_audio.cpp	2010-10-18 21:16:58 UTC (rev 53589)
@@ -226,7 +226,6 @@
 }
 
 TownsAudioInterface::~TownsAudioInterface() {
-	reset();
 	_ready = false;
 	deinit();
 

Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp	2010-10-18 21:03:28 UTC (rev 53588)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_euphony.cpp	2010-10-18 21:16:58 UTC (rev 53589)
@@ -36,17 +36,15 @@
 }
 
 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() {

Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp	2010-10-18 21:03:28 UTC (rev 53588)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp	2010-10-18 21:16:58 UTC (rev 53589)
@@ -1053,7 +1053,6 @@
 }
 
 TownsPC98_AudioDriver::~TownsPC98_AudioDriver() {
-	reset();
 	_ready = false;
 	deinit();
 

Modified: scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
===================================================================
--- scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp	2010-10-18 21:03:28 UTC (rev 53588)
+++ scummvm/trunk/sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp	2010-10-18 21:16:58 UTC (rev 53589)
@@ -1180,7 +1180,6 @@
 void TownsPC98_FmSynth::deinit() {
 	_ready = false;
 	_mixer->stopHandle(_soundHandle);
-	Common::StackLock lock(_mutex);
 	_timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.