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

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

Browse Source
This commit is contained in:
Max Kellermann
2020-05-06 06:14:55 +02:00
parent ba576ffa37 e6a77e1297
commit 864d26cd1b
11 changed files with 42 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/decoder/DecoderPrint.cxx
View File

@@ -47,7 +47,7 @@ decoder_plugin_print(Response &r,
void
decoder_list_print(Response &r)
{
using namespace std::placeholders;
const auto f = std::bind(decoder_plugin_print, std::ref(r), _1);
const auto f = [&](const auto &plugin)
{ return decoder_plugin_print(r, plugin); };
decoder_plugins_for_each_enabled(f);
}

8
src/decoder/Thread.cxx
View File

@@ -183,11 +183,9 @@ decoder_run_stream_locked(DecoderBridge &bridge, InputStream &is,
UriSuffixBuffer suffix_buffer;
const char *const suffix = uri_get_suffix(uri, suffix_buffer);
using namespace std::placeholders;
const auto f = std::bind(decoder_run_stream_plugin,
std::ref(bridge), std::ref(is), std::ref(lock),
suffix,
_1, std::ref(tried_r));
const auto f = [&,suffix](const auto &plugin)
{ return decoder_run_stream_plugin(bridge, is, lock, suffix, plugin, tried_r); };
return decoder_plugins_try(f);
}