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

input/qobuz: create JSON parser on demand

Browse Source
This commit is contained in:
Max Kellermann
2018-01-21 12:49:10 +01:00
parent cb87ed29d8
commit 714e69e708
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/input/plugins/QobuzLoginRequest.cxx
View File

@@ -82,7 +82,6 @@ QobuzLoginRequest::QobuzLoginRequest(CurlGlobal &curl,
const char *device_manufacturer_id, const char *device_manufacturer_id,
QobuzLoginHandler &_handler) noexcept QobuzLoginHandler &_handler) noexcept
:request(curl, *this), :request(curl, *this),
parser(&parse_callbacks, nullptr, this),
handler(_handler) handler(_handler)
{ {
request.SetUrl(MakeLoginUrl(request.Get(), base_url, app_id, request.SetUrl(MakeLoginUrl(request.Get(), base_url, app_id,
@@ -105,6 +104,8 @@ QobuzLoginRequest::OnHeaders(unsigned status,
auto i = headers.find("content-type"); auto i = headers.find("content-type");
if (i == headers.end() || i->second.find("/json") == i->second.npos) if (i == headers.end() || i->second.find("/json") == i->second.npos)
throw std::runtime_error("Not a JSON response from Qobuz"); throw std::runtime_error("Not a JSON response from Qobuz");
parser = {&parse_callbacks, nullptr, this};
} }
void void

3
src/input/plugins/QobuzTrackRequest.cxx
View File

@@ -55,7 +55,6 @@ QobuzTrackRequest::QobuzTrackRequest(QobuzClient &client,
:request(client.GetCurl(), :request(client.GetCurl(),
MakeTrackUrl(client, track_id).c_str(), MakeTrackUrl(client, track_id).c_str(),
*this), *this),
parser(&parse_callbacks, nullptr, this),
handler(_handler) handler(_handler)
{ {
request_headers.Append(("X-User-Auth-Token:" request_headers.Append(("X-User-Auth-Token:"
@@ -78,6 +77,8 @@ QobuzTrackRequest::OnHeaders(unsigned status,
auto i = headers.find("content-type"); auto i = headers.find("content-type");
if (i == headers.end() || i->second.find("/json") == i->second.npos) if (i == headers.end() || i->second.find("/json") == i->second.npos)
throw std::runtime_error("Not a JSON response from Qobuz"); throw std::runtime_error("Not a JSON response from Qobuz");
parser = {&parse_callbacks, nullptr, this};
} }
void void