thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FM-TOWNS AUDIO: improve thread safety

Browse source 
svn-id: r53589
This commit is contained in:
Florian Kagerer 2010-10-18 21:16:58 +00:00
parent 0c72b1800d
commit 5ff68b49d7
4 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sound/softsynth/fmtowns_pc98/towns_audio.cpp
View file

@ -226,7 +226,6 @@ TownsAudioInterface::TownsAudioInterface(Audio::Mixer *mixer, TownsAudioInterfac
} }
TownsAudioInterface::~TownsAudioInterface() { TownsAudioInterface::~TownsAudioInterface() {
reset();
_ready = false; _ready = false;
deinit(); deinit();

4
sound/softsynth/fmtowns_pc98/towns_euphony.cpp
View file

@ -36,17 +36,15 @@ TownsEuphonyDriver::TownsEuphonyDriver(Audio::Mixer *mixer) : _activeChannels(0)
} }
TownsEuphonyDriver::~TownsEuphonyDriver() { TownsEuphonyDriver::~TownsEuphonyDriver() {
delete _intf;
delete[] _activeChannels; delete[] _activeChannels;
delete[] _sustainChannels; delete[] _sustainChannels;
delete[] _assignedChannels; delete[] _assignedChannels;
delete[] _tEnable; delete[] _tEnable;
delete[] _tMode; delete[] _tMode;
delete[] _tOrdr; delete[] _tOrdr;
delete[] _tLevel; delete[] _tLevel;
delete[] _tTranspose; delete[] _tTranspose;
delete _intf;
} }
bool TownsEuphonyDriver::init() { bool TownsEuphonyDriver::init() {

1
sound/softsynth/fmtowns_pc98/towns_pc98_driver.cpp
View file

@ -1053,7 +1053,6 @@ TownsPC98_AudioDriver::TownsPC98_AudioDriver(Audio::Mixer *mixer, EmuType type)
} }
TownsPC98_AudioDriver::~TownsPC98_AudioDriver() { TownsPC98_AudioDriver::~TownsPC98_AudioDriver() {
reset();
_ready = false; _ready = false;
deinit(); deinit();

1
sound/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
View file

@ -1180,7 +1180,6 @@ int TownsPC98_FmSynth::readBuffer(int16 *buffer, const int numSamples) {
void TownsPC98_FmSynth::deinit() { void TownsPC98_FmSynth::deinit() {
_ready = false; _ready = false;
_mixer->stopHandle(_soundHandle); _mixer->stopHandle(_soundHandle);
Common::StackLock lock(_mutex);
_timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback; _timers[0].cb = _timers[1].cb = &TownsPC98_FmSynth::idleTimerCallback;
} }