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

httpd_output: disable Icy-Metadata when encoder supports tags

Browse Source 
There's no reason to send both encoder tags and Icy-Metadata to the
client.  Let's disable Icy-Metadata when the encoder supports embedded
tags.
This commit is contained in:
Max Kellermann
2009-05-05 22:41:36 +02:00
parent ebc1d3516c
commit 9080797025
3 changed files with 33 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/output/httpd_output_plugin.c
View File

@@ -118,7 +118,9 @@ httpd_output_finish(void *data)
static void
httpd_client_add(struct httpd_output *httpd, int fd)
{
struct httpd_client *client = httpd_client_new(httpd, fd);
struct httpd_client *client =
httpd_client_new(httpd, fd,
httpd->encoder->plugin->tag == NULL);
httpd->clients = g_list_prepend(httpd->clients, client);
@@ -380,21 +382,28 @@ httpd_output_tag(void *data, const struct tag *tag)
assert(tag != NULL);
if (httpd->metadata != NULL)
page_unref (httpd->metadata);
if (httpd->encoder->plugin->tag != NULL) {
/* embed encoder tags */
httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
TAG_ITEM_ARTIST,
TAG_ITEM_TITLE,
TAG_NUM_OF_ITEM_TYPES);
encoder_tag(httpd->encoder, tag, NULL);
} else {
/* use Icy-Metadata */
if (httpd->metadata) {
g_mutex_lock(httpd->mutex);
g_list_foreach(httpd->clients, httpd_send_metadata, httpd->metadata);
g_mutex_unlock(httpd->mutex);
if (httpd->metadata != NULL)
page_unref (httpd->metadata);
httpd->metadata =
icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
TAG_ITEM_ARTIST,
TAG_ITEM_TITLE,
TAG_NUM_OF_ITEM_TYPES);
if (httpd->metadata != NULL) {
g_mutex_lock(httpd->mutex);
g_list_foreach(httpd->clients,
httpd_send_metadata, httpd->metadata);
g_mutex_unlock(httpd->mutex);
}
}
encoder_tag(httpd->encoder, tag, NULL);
}
static void