From c58ebaadfe7fbb838d0a20581e20bd84a7e92e3a Mon Sep 17 00:00:00 2001 From: sergm Date: Tue, 2 Dec 2014 09:24:58 +0200 Subject: [PATCH] - Fixed DOSBox patches not working when mt32.thread option is disabled --- DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff | 11 +++++------ DOSBox-mt32-patch/dosbox-SVN-r3873-mt32-patch.diff | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff b/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff index 5f7bf30..317781a 100644 --- a/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff +++ b/DOSBox-mt32-patch/dosbox-0.74-mt32-patch.diff @@ -1,6 +1,6 @@ -commit 2f29fdee73d7171cbd075b5a8b281f0b58c26b0c +commit c941deb824acd8c5f40e420ed077015f0d3f38e8 Author: sergm -Date: Mon Dec 1 21:20:05 2014 +0200 +Date: Tue Dec 2 09:18:57 2014 +0200 mt32emu patch @@ -145,10 +145,10 @@ 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..ce71157 +index 0000000..902651e --- /dev/null +++ b/src/gui/midi_mt32.cpp -@@ -0,0 +1,248 @@ +@@ -0,0 +1,247 @@ +#include +#include +#include @@ -343,8 +343,7 @@ index 0000000..ce71157 + } + midiHandler_mt32.playPos = playPos; + } else { -+ midiHandler_mt32.renderPos = 0; -+ midiHandler_mt32.render(len, (Bit16s *)MixTemp); ++ midiHandler_mt32.synth->render((Bit16s *)MixTemp, len); + midiHandler_mt32.chan->AddSamples_s16(len, (Bit16s *)MixTemp); + } +} diff --git a/DOSBox-mt32-patch/dosbox-SVN-r3873-mt32-patch.diff b/DOSBox-mt32-patch/dosbox-SVN-r3873-mt32-patch.diff index fba1956..1eb63ee 100644 --- a/DOSBox-mt32-patch/dosbox-SVN-r3873-mt32-patch.diff +++ b/DOSBox-mt32-patch/dosbox-SVN-r3873-mt32-patch.diff @@ -1,6 +1,6 @@ -commit 32425e02444c9339ee52a1d5d083e84834c4da47 +commit 3dbce2eee06d542ac32bb7e11529286dd8c62af6 Author: sergm -Date: Mon Dec 1 21:22:55 2014 +0200 +Date: Tue Dec 2 09:19:32 2014 +0200 mt32emu patch @@ -143,10 +143,10 @@ index ce4647f..3d289b8 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..ce71157 +index 0000000..902651e --- /dev/null +++ b/src/gui/midi_mt32.cpp -@@ -0,0 +1,248 @@ +@@ -0,0 +1,247 @@ +#include +#include +#include @@ -341,8 +341,7 @@ index 0000000..ce71157 + } + midiHandler_mt32.playPos = playPos; + } else { -+ midiHandler_mt32.renderPos = 0; -+ midiHandler_mt32.render(len, (Bit16s *)MixTemp); ++ midiHandler_mt32.synth->render((Bit16s *)MixTemp, len); + midiHandler_mt32.chan->AddSamples_s16(len, (Bit16s *)MixTemp); + } +}