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

This commit is contained in:
Max Kellermann
2021-03-04 17:50:53 +01:00
15 changed files with 49 additions and 61 deletions

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);