From ea616b3ed4c1e94f29ac32bcd7751943e2d647a0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 13 Oct 2009 16:12:45 +0200 Subject: tag: removed the "_ITEM_" suffix from the enum names --- src/output/httpd_output_plugin.c | 5 ++--- src/output/shout_plugin.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/output') diff --git a/src/output/httpd_output_plugin.c b/src/output/httpd_output_plugin.c index 9fdf46456..d1296abc2 100644 --- a/src/output/httpd_output_plugin.c +++ b/src/output/httpd_output_plugin.c @@ -433,9 +433,8 @@ httpd_output_tag(void *data, const struct tag *tag) page_unref (httpd->metadata); httpd->metadata = - icy_server_metadata_page(tag, TAG_ITEM_ALBUM, - TAG_ITEM_ARTIST, - TAG_ITEM_TITLE, + icy_server_metadata_page(tag, TAG_ALBUM, + TAG_ARTIST, TAG_TITLE, TAG_NUM_OF_ITEM_TYPES); if (httpd->metadata != NULL) { g_mutex_lock(httpd->mutex); diff --git a/src/output/shout_plugin.c b/src/output/shout_plugin.c index 4412d26ff..f1b21bb36 100644 --- a/src/output/shout_plugin.c +++ b/src/output/shout_plugin.c @@ -471,10 +471,10 @@ shout_tag_to_metadata(const struct tag *tag, char *dest, size_t size) for (unsigned i = 0; i < tag->num_items; i++) { switch (tag->items[i]->type) { - case TAG_ITEM_ARTIST: + case TAG_ARTIST: strncpy(artist, tag->items[i]->value, size); break; - case TAG_ITEM_TITLE: + case TAG_TITLE: strncpy(title, tag->items[i]->value, size); break; -- cgit v1.2.3