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

Implemented basic icy support for the httpd output

Browse Source 
[mk: folded with patch "Put icy related functions in extra source
files"; moved icy_server.c from HAVE_CURL to ENABLE_HTTPD_OUTPUT;
removed an unused variable]
This commit is contained in:
Hagen Schink
2009-04-13 19:35:02 +02:00
committed by Max Kellermann
parent 200be26371
commit 92ba754fc6
7 changed files with 411 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/output/httpd_output_plugin.c
View File

@@ -24,6 +24,7 @@
#include "encoder_list.h"
#include "socket_util.h"
#include "page.h"
#include "icy_server.h"
#include <assert.h>
@@ -83,6 +84,9 @@ httpd_output_init(G_GNUC_UNUSED const struct audio_format *audio_format,
sin->sin_addr.s_addr = INADDR_ANY;
httpd->address_size = sizeof(*sin);
/* initialize metadata */
httpd->metadata = NULL;
/* initialize encoder */
httpd->encoder = encoder_init(encoder_plugin, param, error);
@@ -99,6 +103,9 @@ httpd_output_finish(void *data)
{
struct httpd_output *httpd = data;
if (httpd->metadata)
page_unref(httpd->metadata);
encoder_finish(httpd->encoder);
g_mutex_free(httpd->mutex);
g_free(httpd);
@@ -114,6 +121,10 @@ httpd_client_add(struct httpd_output *httpd, int fd)
struct httpd_client *client = httpd_client_new(httpd, fd);
httpd->clients = g_list_prepend(httpd->clients, client);
/* pass metadata to client */
if (httpd->metadata)
httpd_client_send_metadata(client, httpd->metadata);
}
static gboolean
@@ -353,12 +364,36 @@ httpd_output_play(void *data, const void *chunk, size_t size, GError **error)
return size;
}
static void
httpd_send_metadata(gpointer data, gpointer user_data)
{
struct httpd_client *client = data;
struct page *icy_metadata = user_data;
httpd_client_send_metadata(client, icy_metadata);
}
static void
httpd_output_tag(void *data, const struct tag *tag)
{
struct httpd_output *httpd = data;
/* XXX add suport for icy-metadata */
if (httpd->metadata) {
page_unref (httpd->metadata);
httpd->metadata = NULL;
}
if (tag)
httpd->metadata = icy_server_metadata_page(tag, TAG_ITEM_ALBUM,
TAG_ITEM_ARTIST,
TAG_ITEM_TITLE,
TAG_NUM_OF_ITEM_TYPES);
if (httpd->metadata) {
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);
}