Skip to content

M
mpd
Commit 308fdf6e authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

input/curl: use class TagBuilder

parent 9f4e96fd
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 4 deletions
src/input/CurlInputPlugin.cxx
View file @ 308fdf6e
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include "ConfigGlobal.hxx" #include "ConfigGlobal.hxx"
#include "ConfigData.hxx" #include "ConfigData.hxx"
#include "tag/Tag.hxx" #include "tag/Tag.hxx"
#include "tag/TagBuilder.hxx"
#include "IcyMetaDataParser.hxx" #include "IcyMetaDataParser.hxx"
#include "event/SocketMonitor.hxx" #include "event/SocketMonitor.hxx"
#include "event/TimeoutMonitor.hxx" #include "event/TimeoutMonitor.hxx"
...@@ -780,8 +781,11 @@ copy_icy_tag(struct input_curl *c) ...@@ -780,8 +781,11 @@ copy_icy_tag(struct input_curl *c)
delete c->tag; delete c->tag;
if (!c->meta_name.empty() && !tag->HasType(TAG_NAME)) if (!c->meta_name.empty() && !tag->HasType(TAG_NAME)) {
tag->AddItem(TAG_NAME, c->meta_name.c_str()); TagBuilder tag_builder(std::move(*tag));
tag_builder.AddItem(TAG_NAME, c->meta_name.c_str());
tag_builder.Commit(*tag);
}
c->tag = tag; c->tag = tag;
} }
...@@ -910,8 +914,10 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream) ...@@ -910,8 +914,10 @@ input_curl_headerfunction(void *ptr, size_t size, size_t nmemb, void *stream)
delete c->tag; delete c->tag;
c->tag = new Tag(); TagBuilder tag_builder;
c->tag->AddItem(TAG_NAME, c->meta_name.c_str()); tag_builder.AddItem(TAG_NAME, c->meta_name.c_str());
c->tag = tag_builder.Commit();
} else if (StringEqualsCaseASCII(name, "icy-metaint")) { } else if (StringEqualsCaseASCII(name, "icy-metaint")) {
char buffer[64]; char buffer[64];
size_t icy_metaint; size_t icy_metaint;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment