[Scummvm-git-logs] scummvm master -> a370d45d980570f54a39e9b0db3bde9d8f95fb5e

[athrxx]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
a370d45d98 AUDIO: (FM-TOWNS/PC-98) - adapt mutex handling to latest mixer code changes


Commit: a370d45d980570f54a39e9b0db3bde9d8f95fb5e
    https://github.com/scummvm/scummvm/commit/a370d45d980570f54a39e9b0db3bde9d8f95fb5e
Author: athrxx (athrxx at scummvm.org)
Date: 2021-06-25T00:07:47+02:00

Commit Message:
AUDIO: (FM-TOWNS/PC-98) - adapt mutex handling to latest mixer code changes

Changed paths:
    audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
    audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h


diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
index eeabe6d05d..8be4ae90e0 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.cpp
@@ -948,7 +948,7 @@ void TownsPC98_FmSynthPercussionSource::advanceInput(RhtChannel *ins) {
 #endif // DISABLE_PC98_RHYTHM_CHANNEL
 
 TownsPC98_FmSynth::TownsPC98_FmSynth(Audio::Mixer *mixer, EmuType type) :
-	_mixer(mixer),
+	_mixer(mixer), _mutex(mixer->mutex()),
 	_chanInternal(0), _ssg(0),
 #ifndef DISABLE_PC98_RHYTHM_CHANNEL
 	_prc(0),
diff --git a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
index d0b5349e4c..d92223c9ec 100644
--- a/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
+++ b/audio/softsynth/fmtowns_pc98/towns_pc98_fmsynth.h
@@ -113,7 +113,7 @@ protected:
 	const int _numSSG;
 	const bool _hasPercussion;
 
-	Common::Mutex _mutex;
+	Common::Mutex &_mutex;
 	int _mixerThreadLockCounter;
 
 private: