Do normalization if there's replaygain data but replaygain is off

src/outputBuffer.c

@@ -115,7 +115,7 @@ int sendDataToOutputBuffer(OutputBuffer * cb, InputStream * inStream,
 				       &(cb->audioFormat), data);
 	}
 
-	if (replayGainInfo) {
+	if (replayGainInfo && (replayGainState != REPLAYGAIN_OFF)) {
 		doReplayGain(replayGainInfo, data, datalen, &cb->audioFormat);
 	} else if (normalEnable) {
 		normalizeData(data, datalen, &cb->audioFormat);

src/replayGain.c

@@ -27,7 +27,7 @@
 #include <stdlib.h>
 
 /* Added 4/14/2004 by AliasMrJones */
-static int replayGainState = REPLAYGAIN_OFF;
+int replayGainState = REPLAYGAIN_OFF;
 
 static float replayGainPreamp = 1.0;
 

src/replayGain.h

@@ -26,6 +26,8 @@
 #define REPLAYGAIN_TRACK	1
 #define REPLAYGAIN_ALBUM	2
 
+extern int replayGainState;
+
 typedef struct _ReplayGainInfo {
 	float albumGain;
 	float albumPeak;