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

Merge branch 'struc' of git://github.com/neheb/MPD

Browse Source
This commit is contained in:
Max Kellermann
2021-03-04 17:50:53 +01:00
parent 428f769c38 0fd2c74a66
commit d4bbb8c851
15 changed files with 49 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/input/plugins/CurlInputPlugin.cxx
View File

@@ -404,8 +404,8 @@ CurlInputStream::CurlInputStream(EventLoop &event_loop, const char *_url,
{
request_headers.Append("Icy-Metadata: 1");
for (const auto &i : headers)
request_headers.Append((i.first + ":" + i.second).c_str());
for (const auto &[key, header] : headers)
request_headers.Append((key + ":" + header).c_str());
}
CurlInputStream::~CurlInputStream() noexcept

12
src/input/plugins/QobuzClient.cxx
View File

@@ -174,8 +174,8 @@ QobuzClient::MakeUrl(const char *object, const char *method,
uri += method;
QueryStringBuilder q;
for (const auto &i : query)
q(uri, i.first.c_str(), i.second.c_str());
for (const auto &[key, url] : query)
q(uri, key.c_str(), url.c_str());
q(uri, "app_id", app_id);
return uri;
@@ -195,11 +195,11 @@ QobuzClient::MakeSignedUrl(const char *object, const char *method,
QueryStringBuilder q;
std::string concatenated_query(object);
concatenated_query += method;
for (const auto &i : query) {
q(uri, i.first.c_str(), i.second.c_str());
for (const auto &[key, url] : query) {
q(uri, key.c_str(), url.c_str());
concatenated_query += i.first;
concatenated_query += i.second;
concatenated_query += key;
concatenated_query += url;
}
q(uri, "app_id", app_id);