aboutsummaryrefslogtreecommitdiffstats
path: root/src/DatabaseQueue.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2012-08-07 23:06:41 +0200
committerMax Kellermann <max@duempel.org>2012-08-07 23:12:26 +0200
commitff58207034e63e9f87402f7e3c78080638cb1e2f (patch)
tree9e2bc30c2b6ae4691f5cc52645b1ebadb31ea669 /src/DatabaseQueue.cxx
parentb3d76b7e5c46ff46139457b3aa910d92e290f38f (diff)
downloadmpd-ff58207034e63e9f87402f7e3c78080638cb1e2f.tar.gz
mpd-ff58207034e63e9f87402f7e3c78080638cb1e2f.tar.xz
mpd-ff58207034e63e9f87402f7e3c78080638cb1e2f.zip
db_selection: rename to DatabaseSelection
Diffstat (limited to 'src/DatabaseQueue.cxx')
-rw-r--r--src/DatabaseQueue.cxx11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/DatabaseQueue.cxx b/src/DatabaseQueue.cxx
index 1c24e0aad..e9a47a761 100644
--- a/src/DatabaseQueue.cxx
+++ b/src/DatabaseQueue.cxx
@@ -19,11 +19,11 @@
#include "config.h"
#include "DatabaseQueue.hxx"
+#include "DatabaseSelection.hxx"
extern "C" {
#include "dbUtils.h"
#include "locate.h"
-#include "db_selection.h"
#include "playlist.h"
}
@@ -49,8 +49,7 @@ AddToQueue(struct player_control *pc, song &song, GError **error_r)
bool
addAllIn(struct player_control *pc, const char *uri, GError **error_r)
{
- struct db_selection selection;
- db_selection_init(&selection, uri, true);
+ const DatabaseSelection selection(uri, true);
using namespace std::placeholders;
const auto f = std::bind(AddToQueue, pc, _1, _2);
@@ -70,8 +69,7 @@ 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);
+ const DatabaseSelection selection(uri, true);
using namespace std::placeholders;
const auto f = std::bind(MatchAddSong, pc, criteria, _1, _2);
@@ -92,8 +90,7 @@ 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);
+ const DatabaseSelection selection(uri, true);
struct locate_item_list *new_list =
locate_item_list_casefold(criteria);