diff options
author | Max Kellermann <max@musicpd.org> | 2019-02-20 19:23:11 +0100 |
---|---|---|
committer | Max Kellermann <max@musicpd.org> | 2019-02-20 19:23:11 +0100 |
commit | d9c32155844a7c01c33854679f03340f49160a29 (patch) | |
tree | e43f78255da6f22e4574829858a2f7c6a0441191 /src/mixer | |
parent | 110e6d026b87326ecc739619c36cacb2b2caf303 (diff) |
mixer/pulse: rename `scale` to `scale_volume`
Make it less generic, to avoid clashes.
Diffstat (limited to 'src/mixer')
-rw-r--r-- | src/mixer/plugins/PulseMixerPlugin.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
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); |