diff --git a/src/i_winmusic.c b/src/i_winmusic.c index e78704b1..8c79b675 100644 --- a/src/i_winmusic.c +++ b/src/i_winmusic.c @@ -36,8 +36,6 @@ int winmm_reset_type = -1; int winmm_reset_delay = 0; -int winmm_reverb_level = -1; -int winmm_chorus_level = -1; char *winmm_device = ""; @@ -321,46 +319,6 @@ static void ResetVolume(void) } } -static void ResetReverb(int reset_type) -{ - int i; - int reverb = winmm_reverb_level; - - if (reverb == -1 && reset_type == RESET_TYPE_NONE) - { - // No reverb specified and no SysEx reset selected. Use GM default. - reverb = 40; - } - - if (reverb > -1) - { - for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i) - { - SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_REVERB, reverb); - } - } -} - -static void ResetChorus(int reset_type) -{ - int i; - int chorus = winmm_chorus_level; - - if (chorus == -1 && reset_type == RESET_TYPE_NONE) - { - // No chorus specified and no SysEx reset selected. Use GM default. - chorus = 0; - } - - if (chorus > -1) - { - for (i = 0; i < MIDI_CHANNELS_PER_TRACK; ++i) - { - SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_CHORUS, chorus); - } - } -} - static void ResetControllers(void) { int i; @@ -373,6 +331,8 @@ static void ResetControllers(void) SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_MSB, 0); SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_BANK_SELECT_LSB, 0); SendShortMsg(0, MIDI_EVENT_PROGRAM_CHANGE, i, 0, 0); + SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_REVERB, 40); + SendShortMsg(0, MIDI_EVENT_CONTROLLER, i, MIDI_CONTROLLER_CHORUS, 0); } } @@ -481,9 +441,6 @@ static void ResetDevice(void) ResetPitchBendSensitivity(); } - ResetReverb(reset_type); - ResetChorus(reset_type); - // Reset volume (initial playback or on shutdown if no SysEx reset). if (initial_playback || reset_type == RESET_TYPE_NONE) { diff --git a/src/m_misc.c b/src/m_misc.c index 5b821d72..1d81a6a7 100644 --- a/src/m_misc.c +++ b/src/m_misc.c @@ -95,8 +95,6 @@ extern int mus_gain; extern char *winmm_device; extern int winmm_reset_type; extern int winmm_reset_delay; -extern int winmm_reverb_level; -extern int winmm_chorus_level; #endif extern int opl_gain; extern int midi_player_menu; @@ -520,20 +518,6 @@ default_t defaults[] = { {0}, {0, 2000}, number, ss_none, wad_no, "Delay after reset for native MIDI (milliseconds)" }, - - { - "winmm_reverb_level", - (config_t *) &winmm_reverb_level, NULL, - {-1}, {-1, 127}, number, ss_none, wad_no, - "Reverb send level for native MIDI (-1 = Default, 0 = Off, 127 = Max)" - }, - - { - "winmm_chorus_level", - (config_t *) &winmm_chorus_level, NULL, - {-1}, {-1, 127}, number, ss_none, wad_no, - "Chorus send level for native MIDI (-1 = Default, 0 = Off, 127 = Max)" - }, #endif //