1 files changed, 59 insertions, 67 deletions

diff --git a/src/replay_gain.c b/src/replay_gain_config.c
index bcb501e54..7cb08bba3 100644
--- a/src/replay_gain.c
+++ b/src/replay_gain_config.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2003-2009 The Music Player Daemon Project
+ * Copyright (C) 2003-2010 The Music Player Daemon Project
  * http://www.musicpd.org
  *
  * This program is free software; you can redistribute it and/or modify
@@ -16,16 +16,15 @@
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
-/*
- * (c)2004 replayGain code by AliasMrJones
- */
 
-#include "replay_gain.h"
+#include "config.h"
+#include "replay_gain_config.h"
 #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>
@@ -37,20 +36,52 @@ 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;
+float replay_gain_preamp = 1.0;
+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";
+
+	case REPLAY_GAIN_TRACK:
+		return "track";
 
-	if (!param)
-		return;
+	case REPLAY_GAIN_ALBUM:
+		return "album";
+	}
+
+	/* unreachable */
+	assert(false);
+	return "off";
+}
 
-	if (strcmp(param->value, "track") == 0) {
+bool
+replay_gain_set_mode_string(const char *p)
+{
+	assert(p != NULL);
+
+	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,62 +104,23 @@ void replay_gain_global_init(void)
 
 		replay_gain_preamp = pow(10, f / 20.0);
 	}
-}
-
-static float calc_replay_gain_scale(float gain, float peak)
-{
-	float scale;
-
-	if (gain == 0.0)
-		return (1);
-	scale = pow(10.0, gain / 20.0);
-	scale *= replay_gain_preamp;
-	if (scale > 15.0)
-		scale = 15.0;
-
-	if (scale * peak > 1.0) {
-		scale = 1.0 / peak;
-	}
-	return (scale);
-}
-
-struct replay_gain_info *replay_gain_info_new(void)
-{
-	struct replay_gain_info *ret = g_new(struct replay_gain_info, 1);
-
-	for (unsigned i = 0; i < G_N_ELEMENTS(ret->tuples); ++i) {
-		ret->tuples[i].gain = 0.0;
-		ret->tuples[i].peak = 0.0;
-	}
-
-	/* set to -1 so that we know in replay_gain_apply to compute the scale */
-	ret->scale = -1.0;
-
-	return ret;
-}
 
-void replay_gain_info_free(struct replay_gain_info *info)
-{
-	g_free(info);
-}
+	param = config_get_param(CONF_REPLAYGAIN_MISSING_PREAMP);
 
-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)
-		return;
+	if (param) {
+		char *test;
+		float f = strtod(param->value, &test);
 
-	if (info->scale < 0) {
-		const struct replay_gain_tuple *tuple =
-			&info->tuples[replay_gain_mode];
+		if (*test != '\0') {
+			g_error("Replaygain missing preamp \"%s\" is not a number at "
+				"line %i\n", param->value, param->line);
+		}
 
-		g_debug("computing ReplayGain %s scale with gain %f, peak %f\n",
-			replay_gain_mode_names[replay_gain_mode],
-			tuple->gain, tuple->peak);
+		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);
+		}
 
-		info->scale = calc_replay_gain_scale(tuple->gain, tuple->peak);
+		replay_gain_missing_preamp = pow(10, f / 20.0);
 	}
-
-	pcm_volume(buffer, size, format, pcm_float_to_volume(info->scale));
 }