From cda1560d314cb46501a3e63716789caf8f7d092c Mon Sep 17 00:00:00 2001 From: ceski <56656010+ceski-1@users.noreply.github.com> Date: Sun, 18 Sep 2022 22:11:17 -0700 Subject: [PATCH] Undo music volume slider changes (#737) --- src/i_winmusic.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/src/i_winmusic.c b/src/i_winmusic.c index 70aa8fdf..610fcc0d 100644 --- a/src/i_winmusic.c +++ b/src/i_winmusic.c @@ -140,10 +140,6 @@ static void FillBuffer(void) channel_volume[MIDIEVENT_CHANNEL(event->dwEvent)] = volume; volume *= volume_factor; - if (volume > 127) - { - volume = 127; - } event->dwEvent = (event->dwEvent & 0xFF00FFFF) | ((volume & 0x7F) << 16); @@ -447,10 +443,6 @@ static void UpdateVolume() DWORD msg = 0; int value = channel_volume[i] * volume_factor; - if (value > 127) - { - value = 127; - } msg = MIDI_EVENT_CONTROLLER | i | (MIDI_CONTROLLER_MAIN_VOLUME << 8) | (value << 16); @@ -461,7 +453,7 @@ static void UpdateVolume() static void I_WIN_SetMusicVolume(int volume) { - volume_factor = (float)volume * 8 / 100; + volume_factor = (float)volume / 15; UpdateVolume(); }