Skip to content

M
mpd
Commit 5bc4ab89 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

*Plugin: remove redundant "line %i" from error messages

The MPD core will add this as a prefeix.
parent 44faf108
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 49 deletions
src/encoder/LameEncoderPlugin.cxx
View file @ 5bc4ab89
......@@ -68,16 +68,14 @@ LameEncoder::Configure(const config_param &param, Error &error)
if (*endptr != '\0' || quality < -1.0 || quality > 10.0) {
error.Format(config_domain,
"quality \"%s\" is not a number in the "
"range -1 to 10, line %i",
value, param.line);
"range -1 to 10",
value);
return false;
}
if (param.GetBlockValue("bitrate") != nullptr) {
error.Format(config_domain,
"quality and bitrate are "
"both defined (line %i)",
param.line);
error.Set(config_domain,
"quality and bitrate are both defined");
return false;
}
} else {
......@@ -85,10 +83,8 @@ LameEncoder::Configure(const config_param &param, Error &error)
value = param.GetBlockValue("bitrate");
if (value == nullptr) {
error.Format(config_domain,
"neither bitrate nor quality defined "
"at line %i",
param.line);
error.Set(config_domain,
"neither bitrate nor quality defined");
return false;
}
......@@ -96,9 +92,8 @@ LameEncoder::Configure(const config_param &param, Error &error)
bitrate = g_ascii_strtoll(value, &endptr, 10);
if (*endptr != '\0' || bitrate <= 0) {
error.Format(config_domain,
"bitrate at line %i should be a positive integer",
param.line);
error.Set(config_domain,
"bitrate should be a positive integer");
return false;
}
}
......
src/encoder/TwolameEncoderPlugin.cxx
View file @ 5bc4ab89
......@@ -73,16 +73,14 @@ TwolameEncoder::Configure(const config_param &param, Error &error)
if (*endptr != '\0' || quality < -1.0 || quality > 10.0) {
error.Format(config_domain,
"quality \"%s\" is not a number in the "
"range -1 to 10, line %i",
value, param.line);
"range -1 to 10",
value);
return false;
}
if (param.GetBlockValue("bitrate") != nullptr) {
error.Format(config_domain,
"quality and bitrate are "
"both defined (line %i)",
param.line);
error.Set(config_domain,
"quality and bitrate are both defined");
return false;
}
} else {
......@@ -90,10 +88,8 @@ TwolameEncoder::Configure(const config_param &param, Error &error)
value = param.GetBlockValue("bitrate");
if (value == nullptr) {
error.Format(config_domain,
"neither bitrate nor quality defined "
"at line %i",
param.line);
error.Set(config_domain,
"neither bitrate nor quality defined");
return false;
}
......@@ -101,9 +97,8 @@ TwolameEncoder::Configure(const config_param &param, Error &error)
bitrate = g_ascii_strtoll(value, &endptr, 10);
if (*endptr != '\0' || bitrate <= 0) {
error.Format(config_domain,
"bitrate at line %i should be a positive integer",
param.line);
error.Set(config_domain,
"bitrate should be a positive integer");
return false;
}
}
......
src/encoder/VorbisEncoderPlugin.cxx
View file @ 5bc4ab89
......@@ -75,16 +75,14 @@ vorbis_encoder_configure(struct vorbis_encoder *encoder,
encoder->quality > 10.0) {
error.Format(config_domain,
"quality \"%s\" is not a number in the "
"range -1 to 10, line %i",
value, param.line);
"range -1 to 10",
value);
return false;
}
if (param.GetBlockValue("bitrate") != nullptr) {
error.Format(config_domain,
"quality and bitrate are "
"both defined (line %i)",
param.line);
error.Set(config_domain,
"quality and bitrate are both defined");
return false;
}
} else {
......@@ -92,10 +90,8 @@ vorbis_encoder_configure(struct vorbis_encoder *encoder,
value = param.GetBlockValue("bitrate");
if (value == nullptr) {
error.Format(config_domain,
"neither bitrate nor quality defined "
"at line %i",
param.line);
error.Set(config_domain,
"neither bitrate nor quality defined");
return false;
}
......@@ -104,9 +100,8 @@ vorbis_encoder_configure(struct vorbis_encoder *encoder,
char *endptr;
encoder->bitrate = g_ascii_strtoll(value, &endptr, 10);
if (*endptr != '\0' || encoder->bitrate <= 0) {
error.Format(config_domain,
"bitrate at line %i should be a positive integer",
param.line);
error.Set(config_domain,
"bitrate should be a positive integer");
return false;
}
}
......
src/output/JackOutputPlugin.cxx
View file @ 5bc4ab89
......@@ -290,16 +290,15 @@ mpd_jack_test_default_device(void)
}
static unsigned
parse_port_list(int line, const char *source, char **dest, Error &error)
parse_port_list(const char *source, char **dest, Error &error)
{
char **list = g_strsplit(source, ",", 0);
unsigned n = 0;
for (n = 0; list[n] != nullptr; ++n) {
if (n >= MAX_PORTS) {
error.Format(config_domain,
"too many port names in line %d",
line);
error.Set(config_domain,
"too many port names");
return 0;
}
......@@ -310,8 +309,7 @@ parse_port_list(int line, const char *source, char **dest, Error &error)
if (n == 0) {
error.Format(config_domain,
"at least one port name expected in line %d",
line);
"at least one port name expected");
return 0;
}
......@@ -350,7 +348,7 @@ mpd_jack_init(const config_param &param, Error &error)
/* configure the source ports */
value = param.GetBlockValue("source_ports", "left,right");
jd->num_source_ports = parse_port_list(param.line, value,
jd->num_source_ports = parse_port_list(value,
jd->source_ports, error);
if (jd->num_source_ports == 0)
return nullptr;
......@@ -368,7 +366,7 @@ mpd_jack_init(const config_param &param, Error &error)
if (value != nullptr) {
jd->num_destination_ports =
parse_port_list(param.line, value,
parse_port_list(value,
jd->destination_ports, error);
if (jd->num_destination_ports == 0)
return nullptr;
......
src/output/ShoutOutputPlugin.cxx
View file @ 5bc4ab89
......@@ -142,8 +142,8 @@ ShoutOutput::Configure(const config_param &param, Error &error)
if (*test != '\0' || quality < -1.0 || quality > 10.0) {
error.Format(config_domain,
"shout quality \"%s\" is not a number in the "
"range -1 to 10, line %i",
value, param.line);
"range -1 to 10",
value);
return false;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment