From b40ccae41e0a2a22dc82883a25ef1c02b078d830 Mon Sep 17 00:00:00 2001 From: sergm Date: Sun, 5 Mar 2017 11:43:35 +0200 Subject: [PATCH] - Synced DOSBox patched with current libmt32emu --- DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff | 6 +++--- DOSBox-mt32-patch/dosbox-SVN-r4000-mt32-patch.diff | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff b/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff index 97e3ced..df1e741 100644 --- a/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff +++ b/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff @@ -59,7 +59,7 @@ index 61d15e5..0ec8ebc 100644 Bitu cmd_len; diff --git a/src/gui/midi_mt32.cpp b/src/gui/midi_mt32.cpp new file mode 100644 -index 0000000..9271f33 +index 0000000..7c34fca --- /dev/null +++ b/src/gui/midi_mt32.cpp @@ -0,0 +1,269 @@ @@ -152,8 +152,8 @@ index 0000000..9271f33 + + if (noise) LOG_MSG("MT32: Set maximum number of partials %d", synth->getPartialCount()); + -+ Bitu sampleRate = section->Get_int("mt32.rate"); -+ src = new MT32Emu::SampleRateConverter(*synth, sampleRate, (MT32Emu::SampleRateConverter::Quality)section->Get_int("mt32.src.quality")); ++ int sampleRate = section->Get_int("mt32.rate"); ++ src = new MT32Emu::SampleRateConverter(*synth, sampleRate, (MT32Emu::SamplerateConversionQuality)section->Get_int("mt32.src.quality")); + if (noise) LOG_MSG("MT32: Adding mixer channel at sample rate %d", sampleRate); + chan = MIXER_AddChannel(mixerCallBack, sampleRate, "MT32"); + diff --git a/DOSBox-mt32-patch/dosbox-SVN-r4000-mt32-patch.diff b/DOSBox-mt32-patch/dosbox-SVN-r4000-mt32-patch.diff index 9a4306f..7364491 100644 --- a/DOSBox-mt32-patch/dosbox-SVN-r4000-mt32-patch.diff +++ b/DOSBox-mt32-patch/dosbox-SVN-r4000-mt32-patch.diff @@ -57,7 +57,7 @@ index 57181e0..3bc943b 100644 void MIDI_RawOutByte(Bit8u data) { diff --git a/src/gui/midi_mt32.cpp b/src/gui/midi_mt32.cpp new file mode 100644 -index 0000000..9271f33 +index 0000000..7c34fca --- /dev/null +++ b/src/gui/midi_mt32.cpp @@ -0,0 +1,269 @@ @@ -150,8 +150,8 @@ index 0000000..9271f33 + + if (noise) LOG_MSG("MT32: Set maximum number of partials %d", synth->getPartialCount()); + -+ Bitu sampleRate = section->Get_int("mt32.rate"); -+ src = new MT32Emu::SampleRateConverter(*synth, sampleRate, (MT32Emu::SampleRateConverter::Quality)section->Get_int("mt32.src.quality")); ++ int sampleRate = section->Get_int("mt32.rate"); ++ src = new MT32Emu::SampleRateConverter(*synth, sampleRate, (MT32Emu::SamplerateConversionQuality)section->Get_int("mt32.src.quality")); + if (noise) LOG_MSG("MT32: Adding mixer channel at sample rate %d", sampleRate); + chan = MIXER_AddChannel(mixerCallBack, sampleRate, "MT32"); +