4 files changed, 184 insertions, 210 deletions
diff --git a/Makefile.am b/Makefile.am
index a39267f4f..d0b1b2db7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -241,7 +241,6 @@ src_mpd_SOURCES = \
 	src/conf.c \
 	src/crossfade.c \
 	src/cue/cue_parser.c src/cue/cue_parser.h \
-	src/dbUtils.c \
 	src/decoder_thread.c \
 	src/decoder_control.c \
 	src/decoder_api.c \
@@ -250,6 +249,8 @@ src_mpd_SOURCES = \
 	src/Directory.cxx \
 	src/directory_save.c \
 	src/DatabaseGlue.cxx \
+	src/DatabaseQueue.cxx \
+	src/DatabasePlaylist.cxx \
 	src/db_error.h \
 	src/db_lock.c src/db_lock.h \
 	src/db_save.c src/db_save.h \
diff --git a/src/DatabasePlaylist.cxx b/src/DatabasePlaylist.cxx
new file mode 100644
index 000000000..61e6d1a4f
--- /dev/null
+++ b/src/DatabasePlaylist.cxx
@@ -0,0 +1,74 @@
+/*
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+extern "C" {
+#include "dbUtils.h"
+#include "locate.h"
+#include "db_selection.h"
+#include "stored_playlist.h"
+}
+
+#include "DatabaseGlue.hxx"
+#include "DatabasePlugin.hxx"
+
+#include <functional>
+
+bool
+addAllInToStoredPlaylist(const char *uri_utf8, const char *playlist_path_utf8,
+			 GError **error_r)
+{
+	struct db_selection selection;
+	db_selection_init(&selection, uri_utf8, true);
+
+	using namespace std::placeholders;
+	const auto f = std::bind(spl_append_song, playlist_path_utf8, _1, _2);
+	return GetDatabase()->Visit(&selection, f, error_r);
+}
+
+static bool
+SearchAddSong(const char *playlist_path_utf8,
+	      const struct locate_item_list *criteria,
+	      struct song *song, GError **error_r)
+{
+	return !locate_song_search(song, criteria) ||
+		spl_append_song(playlist_path_utf8, song, error_r);
+}
+
+bool
+search_add_to_playlist(const char *uri, const char *playlist_path_utf8,
+		       const struct locate_item_list *criteria,
+		       GError **error_r)
+{
+	struct db_selection selection;
+	db_selection_init(&selection, uri, true);
+
+	struct locate_item_list *new_list
+		= locate_item_list_casefold(criteria);
+
+	using namespace std::placeholders;
+	const auto f = std::bind(SearchAddSong, playlist_path_utf8,
+				 new_list, _1, _2);
+	bool success = GetDatabase()->Visit(&selection, f, error_r);
+
+	locate_item_list_free(new_list);
+
+	return success;
+}
diff --git a/src/DatabaseQueue.cxx b/src/DatabaseQueue.cxx
new file mode 100644
index 000000000..ce66b7f30
--- /dev/null
+++ b/src/DatabaseQueue.cxx
@@ -0,0 +1,108 @@
+/*
+ * Copyright (C) 2003-2012 The Music Player Daemon Project
+ * http://www.musicpd.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+#include "config.h"
+
+extern "C" {
+#include "dbUtils.h"
+#include "locate.h"
+#include "db_selection.h"
+#include "playlist.h"
+}
+
+#include "DatabaseGlue.hxx"
+#include "DatabasePlugin.hxx"
+
+#include <functional>
+
+static bool
+AddToQueue(struct player_control *pc, struct song *song,
+	   GError **error_r)
+{
+	enum playlist_result result =
+		playlist_append_song(&g_playlist, pc, song, NULL);
+	if (result != PLAYLIST_RESULT_SUCCESS) {
+		g_set_error(error_r, playlist_quark(), result,
+			    "Playlist error");
+		return false;
+	}
+
+	return true;
+}
+
+bool
+addAllIn(struct player_control *pc, const char *uri, GError **error_r)
+{
+	struct db_selection selection;
+	db_selection_init(&selection, uri, true);
+
+	using namespace std::placeholders;
+	const auto f = std::bind(AddToQueue, pc, _1, _2);
+	return GetDatabase()->Visit(&selection, f, error_r);
+}
+
+static bool
+MatchAddSong(struct player_control *pc,
+	     const struct locate_item_list *criteria,
+	     struct song *song, GError **error_r)
+{
+	return !locate_song_match(song, criteria) ||
+		AddToQueue(pc, song, error_r);
+}
+
+bool
+findAddIn(struct player_control *pc, const char *uri,
+	  const struct locate_item_list *criteria, GError **error_r)
+{
+	struct db_selection selection;
+	db_selection_init(&selection, uri, true);
+
+	using namespace std::placeholders;
+	const auto f = std::bind(MatchAddSong, pc, criteria, _1, _2);
+	return GetDatabase()->Visit(&selection, f, error_r);
+}
+
+static bool
+SearchAddSong(struct player_control *pc,
+	      const struct locate_item_list *criteria,
+	      struct song *song, GError **error_r)
+{
+	return !locate_song_search(song, criteria) ||
+		AddToQueue(pc, song, error_r);
+}
+
+bool
+search_add_songs(struct player_control *pc, const char *uri,
+		 const struct locate_item_list *criteria,
+		 GError **error_r)
+{
+	struct db_selection selection;
+	db_selection_init(&selection, uri, true);
+
+	struct locate_item_list *new_list =
+		locate_item_list_casefold(criteria);
+
+	using namespace std::placeholders;
+	const auto f = std::bind(SearchAddSong, pc, new_list, _1, _2);
+	bool success = GetDatabase()->Visit(&selection, f, error_r);
+
+	locate_item_list_free(new_list);
+
+	return success;
+}
diff --git a/src/dbUtils.c b/src/dbUtils.c
deleted file mode 100644
index c212d9f9c..000000000
--- a/src/dbUtils.c
+++ /dev/null
@@ -1,209 +0,0 @@
-/*
- * Copyright (C) 2003-2011 The Music Player Daemon Project
- * http://www.musicpd.org
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
-#include "config.h"
-#include "dbUtils.h"
-#include "locate.h"
-#include "database.h"
-#include "db_visitor.h"
-#include "playlist.h"
-#include "stored_playlist.h"
-
-#include <glib.h>
-
-static bool
-add_to_queue_song(struct song *song, void *ctx, GError **error_r)
-{
-	struct player_control *pc = ctx;
-
-	enum playlist_result result =
-		playlist_append_song(&g_playlist, pc, song, NULL);
-	if (result != PLAYLIST_RESULT_SUCCESS) {
-		g_set_error(error_r, playlist_quark(), result,
-			    "Playlist error");
-		return false;
-	}
-
-	return true;
-}
-
-static const struct db_visitor add_to_queue_visitor = {
-	.song = add_to_queue_song,
-};
-
-bool
-addAllIn(struct player_control *pc, const char *uri, GError **error_r)
-{
-	return db_walk(uri, &add_to_queue_visitor, pc, error_r);
-}
-
-struct add_data {
-	const char *path;
-};
-
-static bool
-add_to_spl_song(struct song *song, void *ctx, GError **error_r)
-{
-	struct add_data *data = ctx;
-
-	if (!spl_append_song(data->path, song, error_r))
-		return false;
-
-	return true;
-}
-
-static const struct db_visitor add_to_spl_visitor = {
-	.song = add_to_spl_song,
-};
-
-bool
-addAllInToStoredPlaylist(const char *uri_utf8, const char *path_utf8,
-			 GError **error_r)
-{
-	struct add_data data = {
-		.path = path_utf8,
-	};
-
-	return db_walk(uri_utf8, &add_to_spl_visitor, &data, error_r);
-}
-
-struct find_add_data {
-	struct player_control *pc;
-	const struct locate_item_list *criteria;
-};
-
-static bool
-find_add_song(struct song *song, void *ctx, GError **error_r)
-{
-	struct find_add_data *data = ctx;
-
-	if (!locate_song_match(song, data->criteria))
-		return true;
-
-	enum playlist_result result =
-		playlist_append_song(&g_playlist, data->pc,
-				     song, NULL);
-	if (result != PLAYLIST_RESULT_SUCCESS) {
-		g_set_error(error_r, playlist_quark(), result,
-			    "Playlist error");
-		return false;
-	}
-
-	return true;
-}
-
-static const struct db_visitor find_add_visitor = {
-	.song = find_add_song,
-};
-
-bool
-findAddIn(struct player_control *pc, const char *name,
-	  const struct locate_item_list *criteria, GError **error_r)
-{
-	struct find_add_data data;
-	data.pc = pc;
-	data.criteria = criteria;
-
-	return db_walk(name, &find_add_visitor, &data, error_r);
-}
-
-static bool
-searchadd_visitor_song(struct song *song, void *_data, GError **error_r)
-{
-	struct find_add_data *data = _data;
-
-	if (!locate_song_search(song, data->criteria))
-		return true;
-
-	enum playlist_result result =
-		playlist_append_song(&g_playlist, data->pc, song, NULL);
-	if (result != PLAYLIST_RESULT_SUCCESS) {
-		g_set_error(error_r, playlist_quark(), result,
-			    "Playlist error");
-		return false;
-	}
-
-	return true;
-}
-
-static const struct db_visitor searchadd_visitor = {
-	.song = searchadd_visitor_song,
-};
-
-bool
-search_add_songs(struct player_control *pc, const char *uri,
-		 const struct locate_item_list *criteria,
-		 GError **error_r)
-{
-	struct locate_item_list *new_list =
-		locate_item_list_casefold(criteria);
-	struct find_add_data data = {
-		.pc = pc,
-		.criteria = new_list,
-	};
-
-	bool success = db_walk(uri, &searchadd_visitor, &data, error_r);
-
-	locate_item_list_free(new_list);
-
-	return success;
-}
-
-struct search_add_playlist_data {
-	const char *playlist;
-	const struct locate_item_list *criteria;
-};
-
-static bool
-searchaddpl_visitor_song(struct song *song, void *_data,
-			 G_GNUC_UNUSED GError **error_r)
-{
-	struct search_add_playlist_data *data = _data;
-
-	if (!locate_song_search(song, data->criteria))
-		return true;
-
-	if (!spl_append_song(data->playlist, song, error_r))
-		return false;
-
-	return true;
-}
-
-static const struct db_visitor searchaddpl_visitor = {
-	.song = searchaddpl_visitor_song,
-};
-
-bool
-search_add_to_playlist(const char *uri, const char *path_utf8,
-		       const struct locate_item_list *criteria,
-		       GError **error_r)
-{
-	struct locate_item_list *new_list
-		= locate_item_list_casefold(criteria);
-	struct search_add_playlist_data data = {
-		.playlist = path_utf8,
-		.criteria = new_list,
-	};
-
-	bool success = db_walk(uri, &searchaddpl_visitor, &data, error_r);
-
-	locate_item_list_free(new_list);
-
-	return success;
-}