1 files changed, 79 insertions, 16 deletions

diff --git a/src/replay_gain.c b/src/replay_gain.c
index bcb501e54..020671c8a 100644
--- a/src/replay_gain.c
+++ b/src/replay_gain.c
@@ -24,8 +24,11 @@
 #include "conf.h"
 #include "audio_format.h"
 #include "pcm_volume.h"
+#include "idle.h"
 
 #include <glib.h>
+
+#include <assert.h>
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
@@ -38,19 +41,51 @@ static const char *const replay_gain_mode_names[] = {
 enum replay_gain_mode replay_gain_mode = REPLAY_GAIN_OFF;
 
 static float replay_gain_preamp = 1.0;
+static float replay_gain_missing_preamp = 1.0;
 
-void replay_gain_global_init(void)
+const char *
+replay_gain_get_mode_string(void)
 {
-	const struct config_param *param = config_get_param(CONF_REPLAYGAIN);
+	switch (replay_gain_mode) {
+	case REPLAY_GAIN_OFF:
+		return "off";
 
-	if (!param)
-		return;
+	case REPLAY_GAIN_TRACK:
+		return "track";
+
+	case REPLAY_GAIN_ALBUM:
+		return "album";
+	}
+
+	/* unreachable */
+	assert(false);
+	return "off";
+}
+
+bool
+replay_gain_set_mode_string(const char *p)
+{
+	assert(p != NULL);
 
-	if (strcmp(param->value, "track") == 0) {
+	if (strcmp(p, "off") == 0)
+		replay_gain_mode = REPLAY_GAIN_OFF;
+	else if (strcmp(p, "track") == 0)
 		replay_gain_mode = REPLAY_GAIN_TRACK;
-	} else if (strcmp(param->value, "album") == 0) {
+	else if (strcmp(p, "album") == 0)
 		replay_gain_mode = REPLAY_GAIN_ALBUM;
-	} else {
+	else
+		return false;
+
+	idle_add(IDLE_OPTIONS);
+
+	return true;
+}
+
+void replay_gain_global_init(void)
+{
+	const struct config_param *param = config_get_param(CONF_REPLAYGAIN);
+
+	if (param != NULL && !replay_gain_set_mode_string(param->value)) {
 		g_error("replaygain value \"%s\" at line %i is invalid\n",
 			param->value, param->line);
 	}
@@ -73,6 +108,25 @@ void replay_gain_global_init(void)
 
 		replay_gain_preamp = pow(10, f / 20.0);
 	}
+
+	param = config_get_param(CONF_REPLAYGAIN_MISSING_PREAMP);
+
+	if (param) {
+		char *test;
+		float f = strtod(param->value, &test);
+
+		if (*test != '\0') {
+			g_error("Replaygain missing preamp \"%s\" is not a number at "
+				"line %i\n", param->value, param->line);
+		}
+
+		if (f < -15 || f > 15) {
+			g_error("Replaygain missing preamp \"%s\" is not between -15 and"
+				"15 at line %i\n", param->value, param->line);
+		}
+
+		replay_gain_missing_preamp = pow(10, f / 20.0);
+	}
 }
 
 static float calc_replay_gain_scale(float gain, float peak)
@@ -116,19 +170,28 @@ void
 replay_gain_apply(struct replay_gain_info *info, char *buffer, int size,
 		  const struct audio_format *format)
 {
-	if (replay_gain_mode == REPLAY_GAIN_OFF || !info)
+	float scale;
+
+	if (replay_gain_mode == REPLAY_GAIN_OFF)
 		return;
 
-	if (info->scale < 0) {
-		const struct replay_gain_tuple *tuple =
-			&info->tuples[replay_gain_mode];
+	if (info) {
+	    if (info->scale < 0) {
+		    const struct replay_gain_tuple *tuple =
+			    &info->tuples[replay_gain_mode];
 
-		g_debug("computing ReplayGain %s scale with gain %f, peak %f\n",
-			replay_gain_mode_names[replay_gain_mode],
-			tuple->gain, tuple->peak);
+		    g_debug("computing ReplayGain %s scale with gain %f, peak %f\n",
+			    replay_gain_mode_names[replay_gain_mode],
+			    tuple->gain, tuple->peak);
 
-		info->scale = calc_replay_gain_scale(tuple->gain, tuple->peak);
+		    info->scale = calc_replay_gain_scale(tuple->gain, tuple->peak);
+	    }
+	    scale = info->scale;
+	}
+	else {
+	    scale = replay_gain_missing_preamp;
+	    g_debug("ReplayGain is missing, computing scale %f\n", scale);
 	}
 
-	pcm_volume(buffer, size, format, pcm_float_to_volume(info->scale));
+	pcm_volume(buffer, size, format, pcm_float_to_volume(scale));
 }