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

src/db/Count.cxx

@@ -89,10 +89,8 @@ GroupCountVisitor(TagCountMap &map, TagType group,
 		  const LightSong &song) noexcept
 {
 	const Tag &tag = song.tag;
-	VisitTagWithFallbackOrEmpty(tag, group,
-				    std::bind(CollectGroupCounts, std::ref(map),
-					      std::cref(tag),
-					      std::placeholders::_1));
+	VisitTagWithFallbackOrEmpty(tag, group, [&](const auto &val)
+		{ return CollectGroupCounts(map, tag, val);  });
 }
 
 void
@@ -109,9 +107,9 @@ PrintSongCount(Response &r, const Partition &partition, const char *name,
 
 		SearchStats stats;
 
-		using namespace std::placeholders;
-		const auto f = std::bind(stats_visitor_song, std::ref(stats),
-					 _1);
+		const auto f = [&](const auto &song)
+			{ return stats_visitor_song(stats, song); };
+
 		db.Visit(selection, f);
 
 		PrintSearchStats(r, stats);
@@ -121,9 +119,9 @@ PrintSongCount(Response &r, const Partition &partition, const char *name,
 
 		TagCountMap map;
 
-		using namespace std::placeholders;
-		const auto f = std::bind(GroupCountVisitor, std::ref(map),
-					 group, _1);
+		const auto f = [&map,group](const auto &song)
+			{ return GroupCountVisitor(map, group, song); };
+
 		db.Visit(selection, f);
 
 		Print(r, group, map);

src/db/DatabasePlaylist.cxx

@@ -38,7 +38,6 @@ search_add_to_playlist(const Database &db, const Storage *storage,
 		       const char *playlist_path_utf8,
 		       const DatabaseSelection &selection)
 {
-	using namespace std::placeholders;
 	const auto f = [=](auto && arg1) { return AddSong(storage, playlist_path_utf8, arg1); };
 	db.Visit(selection, f);
 }

src/db/DatabasePrint.cxx

@@ -146,16 +146,23 @@ db_selection_print(Response &r, Partition &partition,
 {
 	const Database &db = partition.GetDatabaseOrThrow();
 
-	using namespace std::placeholders;
 	const auto d = selection.filter == nullptr
-		? std::bind(full ? PrintDirectoryFull : PrintDirectoryBrief,
-			    std::ref(r), base, _1)
+		? [&,base](const auto &dir)
+			{ return full ?
+				PrintDirectoryFull(r, base, dir) :
+				PrintDirectoryBrief(r, base, dir); }
 		: VisitDirectory();
-	VisitSong s = std::bind(full ? PrintSongFull : PrintSongBrief,
-				std::ref(r), base, _1);
+
+	VisitSong s = [&,base](const auto &song)
+		{ return full ?
+			PrintSongFull(r, base, song) :
+			PrintSongBrief(r, base, song); };
+
 	const auto p = selection.filter == nullptr
-		? std::bind(full ? PrintPlaylistFull : PrintPlaylistBrief,
-			    std::ref(r), base, _1, _2)
+		? [&,base](const auto &playlist, const auto &dir)
+			{ return full ?
+				PrintPlaylistFull(r, base, playlist, dir) :
+				PrintPlaylistBrief(r, base, playlist, dir); }
 		: VisitPlaylist();
 
 	db.Visit(selection, d, s, p);
@@ -175,9 +182,9 @@ PrintSongUris(Response &r, Partition &partition,
 
 	const DatabaseSelection selection("", true, filter);
 
-	using namespace std::placeholders;
-	const auto f = std::bind(PrintSongURIVisitor,
-				 std::ref(r), _1);
+	const auto f = [&](const auto &song)
+		{ return PrintSongURIVisitor(r, song); };
+
 	db.Visit(selection, f);
 }
 

src/db/DatabaseQueue.cxx

@@ -40,7 +40,7 @@ AddFromDatabase(Partition &partition, const DatabaseSelection &selection)
 {
 	const Database &db = partition.instance.GetDatabaseOrThrow();
 
-	using namespace std::placeholders;
-	const auto f = std::bind(AddToQueue, std::ref(partition), _1);
+	const auto f = [&](const auto &song)
+		{ return AddToQueue(partition, song); };
 	db.Visit(selection, f);
 }

src/db/Helpers.cxx

@@ -75,10 +75,9 @@ GetStats(const Database &db, const DatabaseSelection &selection)
 	stats.Clear();
 
 	StringSet artists, albums;
-	using namespace std::placeholders;
-	const auto f = std::bind(StatsVisitSong,
-				 std::ref(stats), std::ref(artists),
-				 std::ref(albums), _1);
+	const auto f = [&](const auto &song)
+		{ return StatsVisitSong(stats, artists, albums, song); };
+
 	db.Visit(selection, f);
 
 	stats.artist_count = artists.size();

src/db/plugins/simple/Mount.cxx

@@ -70,22 +70,20 @@ WalkMount(std::string_view base, const Database &db,
 	  const VisitDirectory &visit_directory, const VisitSong &visit_song,
 	  const VisitPlaylist &visit_playlist)
 {
-	using namespace std::placeholders;
-
 	VisitDirectory vd;
 	if (visit_directory)
-		vd = std::bind(PrefixVisitDirectory,
-			       base, std::ref(visit_directory), _1);
+		vd = [base,&visit_directory](const auto &dir)
+			{ return PrefixVisitDirectory(base, visit_directory, dir); };
 
 	VisitSong vs;
 	if (visit_song)
-		vs = std::bind(PrefixVisitSong,
-			       base, std::ref(visit_song), _1);
+		vs = [base,&visit_song](const auto &song)
+			{ return PrefixVisitSong(base, visit_song, song); };
 
 	VisitPlaylist vp;
 	if (visit_playlist)
-		vp = std::bind(PrefixVisitPlaylist,
-			       base, std::ref(visit_playlist), _1, _2);
+		vp = [base,&visit_playlist](const auto &playlist, const auto &dir)
+			{ return PrefixVisitPlaylist(base, visit_playlist, playlist, dir); };
 
 	DatabaseSelection selection(old_selection);
 	selection.uri = uri;