# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1209389512 -10800
# Node ID cdccb12b19a620f657ec42a1316101b2b12aa1e0
# Parent  a4f694a99c5bbdd3edeebf5777b41481cffbd801# Parent  0b0609eff29bea00dbdec71587b57164205a04be
Automated merge with file:/home/ccr/audacious/plugins

diff -r a4f694a99c5b -r cdccb12b19a6 src/modplug/load_s3m.cxx
--- a/src/modplug/load_s3m.cxx	Mon Apr 28 04:24:33 2008 +0300
+++ b/src/modplug/load_s3m.cxx	Mon Apr 28 16:31:52 2008 +0300
@@ -91,7 +91,7 @@
 	case 'S':	command = CMD_S3MCMDEX; break;
 	case 'T':	command = CMD_TEMPO; break;
 	case 'U':	command = CMD_FINEVIBRATO; break;
-	case 'V':	command = CMD_GLOBALVOLUME; break;
+	case 'V':	command = CMD_GLOBALVOLUME; if (!bIT) param *= 2; break;
 	case 'W':	command = CMD_GLOBALVOLSLIDE; break;
 	case 'X':	command = CMD_PANNING8; break;
 	case 'Y':	command = CMD_PANBRELLO; break;
@@ -131,7 +131,7 @@
 	case CMD_S3MCMDEX:			command = 'S'; break;
 	case CMD_TEMPO:				command = 'T'; break;
 	case CMD_FINEVIBRATO:		command = 'U'; break;
-	case CMD_GLOBALVOLUME:		command = 'V'; break;
+	case CMD_GLOBALVOLUME:		command = 'V'; if (!bIT) param >>= 1;break;
 	case CMD_GLOBALVOLSLIDE:	command = 'W'; break;
 	case CMD_PANNING8:			
 		command = 'X';
diff -r a4f694a99c5b -r cdccb12b19a6 src/modplug/load_xm.cxx
--- a/src/modplug/load_xm.cxx	Mon Apr 28 04:24:33 2008 +0300
+++ b/src/modplug/load_xm.cxx	Mon Apr 28 16:31:52 2008 +0300
@@ -391,6 +391,9 @@
 		penv->VolEnv.nNodes = xmsh.vnum;
 		if (!xmsh.vnum) penv->dwFlags &= ~ENV_VOLUME;
 		if (!xmsh.pnum) penv->dwFlags &= ~ENV_PANNING;
+		if (!(penv->dwFlags & ENV_VOLUME) && !penv->nFadeOut) {
+			penv->nFadeOut = 8192;
+		}
 		penv->PanEnv.nNodes = xmsh.pnum;
 		penv->VolEnv.nSustainStart = penv->VolEnv.nSustainEnd = xmsh.vsustain;
 		if (xmsh.vsustain >= 12) penv->dwFlags &= ~ENV_VOLSUSTAIN;