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

filter/route: check configured channel count in method init()

Browse Source 
Detect misconfiguration during MPD startup, not when playback begins.
This commit is contained in:
Max Kellermann 2009-12-25 14:56:14 +01:00
parent c3bb81abec
commit bd29f7e3c8
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/filter/route_filter_plugin.c
View File

@ -178,6 +178,14 @@ route_filter_parse(const struct config_param *param,
g_strfreev(sd); g_strfreev(sd);
} }
if (!audio_valid_channel_count(filter->min_output_channels)) {
g_strfreev(tokens);
g_set_error(error_r, audio_format_quark(), 0,
"Invalid number of output channels requested: %d",
filter->min_output_channels);
return false;
}
// Allocate a map of "copy nothing to me" // Allocate a map of "copy nothing to me"
filter->sources = filter->sources =
g_malloc(filter->min_output_channels * sizeof(signed char)); g_malloc(filter->min_output_channels * sizeof(signed char));
@ -242,7 +250,7 @@ route_filter_finish(struct filter *_filter)
static const struct audio_format * static const struct audio_format *
route_filter_open(struct filter *_filter, route_filter_open(struct filter *_filter,
const struct audio_format *audio_format, const struct audio_format *audio_format,
GError **error_r) G_GNUC_UNUSED GError **error_r)
{ {
struct route_filter *filter = (struct route_filter *)_filter; struct route_filter *filter = (struct route_filter *)_filter;
@ -251,13 +259,6 @@ route_filter_open(struct filter *_filter,
filter->input_frame_size = filter->input_frame_size =
audio_format_frame_size(&filter->input_format); audio_format_frame_size(&filter->input_format);
if (!audio_valid_channel_count(filter->min_output_channels)) {
g_set_error(error_r, audio_format_quark(), 2,
"Invalid number of output channels requested: %d",
filter->min_output_channels);
return NULL;
}
// Decide on an output format which has enough channels, // Decide on an output format which has enough channels,
// and is otherwise identical // and is otherwise identical
filter->output_format = *audio_format; filter->output_format = *audio_format;