From b9bea5fa405534d54a46507b758e9afd931cb6db Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Wed, 12 Feb 2003 04:54:31 +0000 Subject: [PATCH] Ben Nason - Mon, 10 Feb 2003 11:50:27 -0800 * Fixed volume control on MOD music chunk --- CHANGES | 2 ++ mikmod/mplayer.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/CHANGES b/CHANGES index 5fb8fe59..96c3890a 100644 --- a/CHANGES +++ b/CHANGES @@ -1,4 +1,6 @@ 1.2.5: +Ben Nason - Mon, 10 Feb 2003 11:50:27 -0800 + * Fixed volume control on MOD music chunks Patrice Mandin - Fri, 31 Jan 2003 15:17:30 +0100 * Added support for the Atari platform Ryan C. Gordon - Fri Dec 27 10:14:07 EST 2002 diff --git a/mikmod/mplayer.c b/mikmod/mplayer.c index 1f239012..7e0bcf74 100644 --- a/mikmod/mplayer.c +++ b/mikmod/mplayer.c @@ -1939,6 +1939,8 @@ void pt_UpdateVoices(int max_volume) tmpvol*=envvol; /* * max 256 */ tmpvol*=pf->volume; /* * max 128 */ tmpvol/=4194304UL; + tmpvol*=pf->initvolume; /* * max 128 */ + tmpvol/=128; /* fade out */ if (pf->sngpos>=pf->numpos) tmpvol=0;