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

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

Browse Source
This commit is contained in:
Max Kellermann
2020-11-04 20:34:55 +01:00
parent 3d276d50b4 f1fc5d79ca
commit 0b8208fe7f
3 changed files with 23 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/db/plugins/ProxyDatabasePlugin.cxx
View File

@@ -356,11 +356,9 @@ SendConstraints(mpd_connection *connection, const SongFilter &filter)
filter.ToExpression().c_str());
#endif
for (const auto &i : filter.GetItems())
if (!SendConstraints(connection, *i))
return false;
return true;
return std::all_of(
filter.GetItems().begin(), filter.GetItems().end(),
[=](const auto &item) { return SendConstraints(connection, *item); });
}
static bool
@@ -896,11 +894,8 @@ IsFilterFullySupported(const SongFilter &filter,
(void)connection;
#endif
for (const auto &i : filter.GetItems())
if (!IsFilterSupported(*i))
return false;
return true;
return std::all_of(filter.GetItems().begin(), filter.GetItems().end(),
[](const auto &item) { return IsFilterSupported(*item); });
}
gcc_pure