commit 325134721389d507e23144d7f8c332421bd6e108
Author: ceski <56656010+ceski-1@users.noreply.github.com>
AuthorDate: Mon May 15 10:05:25 2023 -0700
Commit: ceski <56656010+ceski-1@users.noreply.github.com>
CommitDate: Mon May 15 10:05:25 2023 -0700
Clean up "reset all controllers" handling
---
src/i_winmusic.c | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
diff --git a/src/i_winmusic.c b/src/i_winmusic.c
index 6fd4e014..cfb8927b 100644
--- a/src/i_winmusic.c
+++ b/src/i_winmusic.c
@@ -964,17 +964,10 @@ static boolean AddToBuffer(unsigned int delta_time, midi_event_t *event,
break;
case MIDI_CONTROLLER_RESET_ALL_CTRLS:
+ // MS GS Wavetable Synth resets volume if param2 isn't zero.
SendShortMsg(delta_time, MIDI_EVENT_CONTROLLER,
event->data.channel.channel,
MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
-
- // MS GS Wavetable Synth resets the channel volume after a
- // "reset all controllers" event, so reapply the volume
- if (MidiDevice == ms_gs_synth)
- {
- i = event->data.channel.channel;
- SendVolumeMsg(0, i, channel_volume[i]);
- }
break;
default:
@@ -1154,17 +1147,6 @@ static void FillBuffer(void)
{
SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_RESET_ALL_CTRLS, 0);
}
-
- // MS GS Wavetable Synth resets the channel volume after a
- // "reset all controllers" event, so reapply the volume
- if (MidiDevice == ms_gs_synth)
- {
- for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i)
- {
- SendVolumeMsg(0, i, channel_volume[i]);
- }
- }
-
RestartTracks();
continue;
}