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

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

Browse Source
This commit is contained in:
Max Kellermann
2020-11-10 16:02:34 +01:00
parent a99bc91eb0 071d3c71d8
commit a9714e73c8
3 changed files with 17 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/storage/plugins/UdisksStorage.cxx
View File

@@ -227,8 +227,7 @@ try {
DBUS_OM_INTERFACE,
"GetManagedObjects");
list_request.Send(connection, *msg.Get(),
std::bind(&UdisksStorage::OnListReply,
this, std::placeholders::_1));
[this](auto o) { return OnListReply(std::move(o)); });
return;
}
@@ -239,8 +238,7 @@ try {
AppendMessageIter(*msg.Get()).AppendEmptyArray<DictEntryTypeTraits<StringTypeTraits, VariantTypeTraits>>();
mount_request.Send(connection, *msg.Get(),
std::bind(&UdisksStorage::OnMountNotify,
this, std::placeholders::_1));
[this](auto o) { return OnMountNotify(std::move(o)); });
} catch (...) {
const std::lock_guard<Mutex> lock(mutex);
mount_error = std::current_exception();
@@ -297,8 +295,7 @@ try {
AppendMessageIter(*msg.Get()).AppendEmptyArray<DictEntryTypeTraits<StringTypeTraits, VariantTypeTraits>>();
mount_request.Send(connection, *msg.Get(),
std::bind(&UdisksStorage::OnUnmountNotify,
this, std::placeholders::_1));
[this](auto u) { return OnUnmountNotify(std::move(u)); });
} catch (...) {
const std::lock_guard<Mutex> lock(mutex);
mount_error = std::current_exception();