diff options
| author | Max Kellermann <max@musicpd.org> | 2021-03-04 17:50:53 +0100 |
|---|---|---|
| committer | Max Kellermann <max@musicpd.org> | 2021-03-04 17:50:53 +0100 |
| commit | d4bbb8c85110a8a12ee012f906f772c1308909ac (patch) | |
| tree | 9931cfad2adaddfb9b02ca94b4b71d3f394df825 /src/input | |
| parent | 428f769c38da9f53059931aa5d722ce072344945 (diff) | |
| parent | 0fd2c74a66fea893496d25561fd56b5ad5c45090 (diff) | |
Merge branch 'struc' of git://github.com/neheb/MPD
Diffstat (limited to 'src/input')
| -rw-r--r-- | src/input/plugins/CurlInputPlugin.cxx | 4 | ||||
| -rw-r--r-- | src/input/plugins/QobuzClient.cxx | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/input/plugins/CurlInputPlugin.cxx b/src/input/plugins/CurlInputPlugin.cxx index 409a2280f..a2c8e505b 100644 --- a/src/input/plugins/CurlInputPlugin.cxx +++ b/src/input/plugins/CurlInputPlugin.cxx @@ -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 diff --git a/src/input/plugins/QobuzClient.cxx b/src/input/plugins/QobuzClient.cxx index 0e47aee21..92e74c588 100644 --- a/src/input/plugins/QobuzClient.cxx +++ b/src/input/plugins/QobuzClient.cxx @@ -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); |