diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/kyra/sound/sound_towns_darkmoon.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/fmtowns.cpp | 2 | ||||
| -rw-r--r-- | engines/sci/sound/drivers/pc9801.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/imuse/drivers/fmtowns.cpp | 3 |
4 files changed, 5 insertions, 6 deletions
diff --git a/engines/kyra/sound/sound_towns_darkmoon.cpp b/engines/kyra/sound/sound_towns_darkmoon.cpp index 55bd800512..17ced42209 100644 --- a/engines/kyra/sound/sound_towns_darkmoon.cpp +++ b/engines/kyra/sound/sound_towns_darkmoon.cpp @@ -35,7 +35,7 @@ namespace Kyra { SoundTowns_Darkmoon::SoundTowns_Darkmoon(KyraEngine_v1 *vm, Audio::Mixer *mixer) : Sound(vm, mixer) { - _intf = new TownsAudioInterface(mixer, this, false); + _intf = new TownsAudioInterface(mixer, this); _pcmData = 0; _pcmVol = 0; _timer = 0; diff --git a/engines/sci/sound/drivers/fmtowns.cpp b/engines/sci/sound/drivers/fmtowns.cpp index 4dd74bc42d..7475b01a6f 100644 --- a/engines/sci/sound/drivers/fmtowns.cpp +++ b/engines/sci/sound/drivers/fmtowns.cpp @@ -405,7 +405,7 @@ int TownsMidiPart::allocateChannel() { } MidiDriver_FMTowns::MidiDriver_FMTowns(Audio::Mixer *mixer, SciVersion version) : _version(version), _timerProc(0), _timerProcPara(0), _baseTempo(10080), _ready(false), _isOpen(false), _masterVolume(0x0f), _soundOn(true) { - _intf = new TownsAudioInterface(mixer, this, true); + _intf = new TownsAudioInterface(mixer, this); _out = new TownsChannel*[6]; for (int i = 0; i < 6; i++) _out[i] = new TownsChannel(this, i); diff --git a/engines/sci/sound/drivers/pc9801.cpp b/engines/sci/sound/drivers/pc9801.cpp index fe7d5bf7ba..a4b634f1dd 100644 --- a/engines/sci/sound/drivers/pc9801.cpp +++ b/engines/sci/sound/drivers/pc9801.cpp @@ -1322,9 +1322,9 @@ MidiDriver_PC9801::MidiDriver_PC9801(Audio::Mixer *mixer, SciVersion version) _polyphony(9), _channelMask1(0x10), _channelMask2(0x02) { _pc98a = #ifdef SCI_PC98_AUDIO_EXTENDED - new PC98AudioCore(mixer, this, kType86, true); + new PC98AudioCore(mixer, this, kType86); #else - new PC98AudioCore(mixer, this, kType26, true); + new PC98AudioCore(mixer, this, kType26); #endif } diff --git a/engines/scumm/imuse/drivers/fmtowns.cpp b/engines/scumm/imuse/drivers/fmtowns.cpp index 37765e07e7..cf15fcdb25 100644 --- a/engines/scumm/imuse/drivers/fmtowns.cpp +++ b/engines/scumm/imuse/drivers/fmtowns.cpp @@ -827,8 +827,7 @@ const uint8 TownsMidiInputChannel::_programAdjustLevel[] = { MidiDriver_TOWNS::MidiDriver_TOWNS(Audio::Mixer *mixer) : _timerProc(0), _timerProcPara(0), _channels(0), _out(0), _baseTempo(10080), _chanState(0), _operatorLevelTable(0), _tickCounter(0), _rand(1), _allocCurPos(0), _isOpen(false) { - // We set exteral mutex handling to true to avoid lockups in SCUMM which has its own mutex. - _intf = new TownsAudioInterface(mixer, this, true); + _intf = new TownsAudioInterface(mixer, this); _channels = new TownsMidiInputChannel*[32]; for (int i = 0; i < 32; i++) |