From 4117a2d2e2f49963346a0309ab456c390f050610 Mon Sep 17 00:00:00 2001 From: Marvin Scholz <epirat07@gmail.com> Date: Tue, 28 Jun 2016 11:39:57 +0000 Subject: [PATCH] Config: Rename mp3-metadata-interval to icy-metadata-interval As proposed in #2272, this renames the mount specific mp3-metadata-interval to icy-metadata-interval to prevent confusion about what it does (setting the icy metadata interval) and to make clear it's not mp3 specific but ICY specific. --- src/cfgfile.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/cfgfile.c b/src/cfgfile.c index 194e1ab5..dfe28913 100644 --- a/src/cfgfile.c +++ b/src/cfgfile.c @@ -1328,6 +1328,15 @@ static void _parse_mount(xmlDocPtr doc, mount->charset = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); } else if (xmlStrcmp(node->name, XMLSTR("mp3-metadata-interval")) == 0) { + ICECAST_LOG_WARN("<mp3-metadata-interval> is deprecated and will be " + "removed in a future version. " + "Please use <icy-metadata-interval> instead."); + /* FIXME when do we plan to remove this? */ + tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); + mount->mp3_meta_interval = atoi(tmp); + if(tmp) + xmlFree(tmp); + } else if (xmlStrcmp(node->name, XMLSTR("icy-metadata-interval")) == 0) { tmp = (char *)xmlNodeListGetString(doc, node->xmlChildrenNode, 1); mount->mp3_meta_interval = atoi(tmp); if(tmp) -- GitLab