diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-21 23:01:04 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-21 23:01:04 +0200 |
| commit | 9526fdbe730edb4b095a1e12aade0e16f1da2292 (patch) | |
| tree | 4544e77bf35e08a12d2b019e0bf3942754b85b96 /src/output/shout_plugin.c | |
| parent | a5c4566fa1551953b84882a1fa53400c7bd6551c (diff) | |
| download | mpd-9526fdbe730edb4b095a1e12aade0e16f1da2292.tar.gz mpd-9526fdbe730edb4b095a1e12aade0e16f1da2292.tar.xz mpd-9526fdbe730edb4b095a1e12aade0e16f1da2292.zip | |
audio_format: wildcards allowed in audio_format configuration
An asterisk means that this attribute should not be enforced, and
stays whatever it used to be. This way, some configuration values
work like masks.
Diffstat (limited to '')
| -rw-r--r-- | src/output/shout_plugin.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index f1b21bb36..da90efd2d 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -126,6 +126,13 @@ my_shout_init_driver(const struct audio_format *audio_format, struct block_param *block_param; int public; + if (audio_format == NULL || + !audio_format_fully_defined(audio_format)) { + g_set_error(error, shout_output_quark(), 0, + "Need full audio format specification"); + return NULL; + } + sd = new_shout_data(); if (shout_init_count == 0) @@ -191,8 +198,6 @@ my_shout_init_driver(const struct audio_format *audio_format, } } - check_block_param("format"); - encoding = config_get_block_string(param, "encoding", "ogg"); encoder_plugin = shout_encoder_plugin_get(encoding); if (encoder_plugin == NULL) { |