diff options
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | doc/plugins.rst | 2 | ||||
| -rw-r--r-- | src/mixer/plugins/PulseMixerPlugin.cxx | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -8,6 +8,8 @@ ver 0.21.5 (not yet released) - ape: map "Album Artist" * output - shout: add support for TLS +* mixer + - pulse: add "scale_volume" setting ver 0.21.4 (2019/01/04) * database diff --git a/doc/plugins.rst b/doc/plugins.rst index 5b39069cb..3b16096d0 100644 --- a/doc/plugins.rst +++ b/doc/plugins.rst @@ -935,7 +935,7 @@ The pulse plugin connects to a `PulseAudio <http://www.freedesktop.org/wiki/Soft - Sets the host name of the PulseAudio server. By default, :program:`MPD` connects to the local PulseAudio server. * - **sink NAME** - Specifies the name of the PulseAudio sink :program:`MPD` should play on. - * - **scale FACTOR** + * - **scale_volume FACTOR** - Specifies a linear scaling coefficient (ranging from 0.5 to 5.0) to apply when adjusting volume through :program:`MPD`. For example, chosing a factor equal to ``"0.7"`` means that setting the volume to 100 in :program:`MPD` will set the PulseAudio volume to 70%, and a factor equal to ``"3.5"`` means that volume 100 in :program:`MPD` corresponds to a 350% PulseAudio volume. recorder diff --git a/src/mixer/plugins/PulseMixerPlugin.cxx b/src/mixer/plugins/PulseMixerPlugin.cxx index d2bfb2444..e3ef987eb 100644 --- a/src/mixer/plugins/PulseMixerPlugin.cxx +++ b/src/mixer/plugins/PulseMixerPlugin.cxx @@ -174,7 +174,7 @@ parse_volume_scale_factor(const char *value) { float factor = ParseFloat(value, &endptr); if (*endptr != '\0' || factor < 0.5 || factor > 5.0) - throw FormatRuntimeError("scale \"%s\" is not a number in the " + throw FormatRuntimeError("\"%s\" is not a number in the " "range 0.5 to 5.0", value); @@ -187,7 +187,7 @@ pulse_mixer_init(gcc_unused EventLoop &event_loop, AudioOutput &ao, const ConfigBlock &block) { PulseOutput &po = (PulseOutput &)ao; - float scale = parse_volume_scale_factor(block.GetBlockValue("scale")); + float scale = parse_volume_scale_factor(block.GetBlockValue("scale_volume")); PulseMixer *pm = new PulseMixer(po, listener, scale); pulse_output_set_mixer(po, *pm); |