filter/ReplayGain: skip PcmVolume if a mixer is set

Previously, volume was applied twice: once by PcmVolume, and again by the hardware mixer.

filter/ReplayGain: skip PcmVolume if a mixer is set
072e39c9 · Max Kellermann · 8dc3f3b2 · 072e39c9 · 072e39c9
Commit 072e39c9 authored Jul 01, 2016 by Max Kellermann
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

NEWS NEWS +1 -0

ReplayGainFilterPlugin.cxx src/filter/plugins/ReplayGainFilterPlugin.cxx +5 -4

No files found.
--- a/NEWS
+++ b/NEWS
 ver 0.19.17 (not yet released)
+* replay gain: fix "replay_gain_handler mixer" setting

 ver 0.19.16 (2016/06/13)
 * faster seeking

--- a/src/filter/plugins/ReplayGainFilterPlugin.cxx
+++ b/src/filter/plugins/ReplayGainFilterPlugin.cxx
@@ -134,8 +134,6 @@ ReplayGainFilter::Update()
 		volume = pcm_float_to_volume(scale);
 	}

-	pv.SetVolume(volume);
-
 	if (mixer != nullptr) {
 		/* update the hardware mixer volume */

@@ -146,7 +144,8 @@ ReplayGainFilter::Update()
 		Error error;
 		if (!mixer_set_volume(mixer, _volume, error))
 			LogError(error, "Failed to update hardware mixer");
-	}
+	} else
+		pv.SetVolume(volume);
 }

 static Filter *
@@ -174,7 +173,9 @@ ReplayGainFilter::Close()
 ConstBuffer<void>
 ReplayGainFilter::FilterPCM(ConstBuffer<void> src, gcc_unused Error &error)
 {
-	return pv.Apply(src);
+	return mixer != nullptr
+		? src
+		: pv.Apply(src);
 }

 const struct filter_plugin replay_gain_filter_plugin = {