oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

mixer/pulse: rename scale to scale_volume

Browse Source 
Make it less generic, to avoid clashes.
This commit is contained in:
Max Kellermann
2019-02-20 19:23:11 +01:00
parent 110e6d026b
commit d9c3215584
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mixer/plugins/PulseMixerPlugin.cxx
+2 -2
View File
@@ -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);