diff options
| author | Thomas Jansen <mithi@mithi.net> | 2011-02-04 14:14:29 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-02-09 22:42:51 +0100 |
| commit | 144d09263786a4cdc6cfc19c5bf3ae7784e5f6e1 (patch) | |
| tree | b615daaf38a87558d96383934dce2968119c9381 | |
| parent | 2bde9afdb9ea82525256686b16034fce99f4f63a (diff) | |
output/shout: add possibility to set url
Added a new optional parameter for the shout plugin called "url".
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | doc/mpd.conf.5 | 3 | ||||
| -rw-r--r-- | doc/mpdconf.example | 1 | ||||
| -rw-r--r-- | doc/user.xml | 9 | ||||
| -rw-r--r-- | src/output/shout_plugin.c | 7 |
5 files changed, 21 insertions, 0 deletions
@@ -9,6 +9,7 @@ ver 0.17 (2011/??/??) * output: - osx: allow user to specify other audio devices - raop: new output plugin + - shout: add possibility to set url ver 0.16.1 (2011/01/09) diff --git a/doc/mpd.conf.5 b/doc/mpd.conf.5 index 4cddd7ba..c75d4aad 100644 --- a/doc/mpd.conf.5 +++ b/doc/mpd.conf.5 @@ -464,6 +464,9 @@ connect to the icecast server. The default is 2 seconds. .B description <description> This specifies a description of the stream. .TP +.B url <url> +This specifies a URL associated with the stream. +.TP .B genre <genre> This specifies the genre(s) of the stream. .SH FILES diff --git a/doc/mpdconf.example b/doc/mpdconf.example index b14337c7..c31763ff 100644 --- a/doc/mpdconf.example +++ b/doc/mpdconf.example @@ -235,6 +235,7 @@ input { ## protocol "icecast2" # optional ## user "source" # optional ## description "My Stream Description" # optional +## url "http://example.com" # optional ## genre "jazz" # optional ## public "no" # optional ## timeout "2" # optional diff --git a/doc/user.xml b/doc/user.xml index 1f74a02d..f24c7bdb 100644 --- a/doc/user.xml +++ b/doc/user.xml @@ -1559,6 +1559,15 @@ cd mpd-version</programlisting> </row> <row> <entry> + <varname>url</varname> + <parameter>URL</parameter> + </entry> + <entry> + Sets a URL associated with the stream (optional). + </entry> + </row> + <row> + <entry> <varname>public</varname> <parameter>yes|no</parameter> </entry> diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index 3ce4d637..484e4731 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -277,6 +277,13 @@ my_shout_init_driver(const struct audio_format *audio_format, return NULL; } + value = config_get_block_string(param, "url", NULL); + if (value != NULL && shout_set_url(sd->shout_conn, value)) { + g_set_error(error, shout_output_quark(), 0, + "%s", shout_get_error(sd->shout_conn)); + return NULL; + } + { char temp[11]; memset(temp, 0, sizeof(temp)); |