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

input/Proxy: use InputStreamPtr

Browse Source
This commit is contained in:
Max Kellermann
2017-12-26 11:37:29 +01:00
parent fb9a2c5431
commit 49619fbd77
9 changed files with 50 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -438,21 +438,16 @@ CurlInputStream::DoSeek(offset_type new_offset)
inline InputStream *
CurlInputStream::Open(const char *url, Mutex &mutex, Cond &cond)
{
CurlInputStream *c = new CurlInputStream((*curl_init)->GetEventLoop(),
url, mutex, cond);
auto c = std::make_unique<CurlInputStream>((*curl_init)->GetEventLoop(),
url, mutex, cond);
try {
BlockingCall(c->GetEventLoop(), [c](){
c->InitEasy();
c->StartRequest();
});
} catch (...) {
delete c;
throw;
}
BlockingCall(c->GetEventLoop(), [&c](){
c->InitEasy();
c->StartRequest();
});
auto icy = c->icy;
return new IcyInputStream(c, std::move(icy));
return new IcyInputStream(std::move(c), std::move(icy));
}
static InputStream *