aboutsummaryrefslogtreecommitdiffstats
path: root/src/dbUtils.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/dbUtils.c')
-rw-r--r--src/dbUtils.c18
1 files changed, 12 insertions, 6 deletions
diff --git a/src/dbUtils.c b/src/dbUtils.c
index f950d42cc..9a44b314b 100644
--- a/src/dbUtils.c
+++ b/src/dbUtils.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2003-2010 The Music Player Daemon Project
+ * 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
@@ -29,6 +29,7 @@
#include "tag.h"
#include "strset.h"
#include "stored_playlist.h"
+#include "client_internal.h"
#include <glib.h>
@@ -166,9 +167,11 @@ int printAllIn(struct client *client, const char *name)
}
static int
-directoryAddSongToPlaylist(struct song *song, G_GNUC_UNUSED void *data)
+directoryAddSongToPlaylist(struct song *song, void *data)
{
- return playlist_append_song(&g_playlist, song, NULL);
+ struct player_control *pc = data;
+
+ return playlist_append_song(&g_playlist, pc, song, NULL);
}
struct add_data {
@@ -185,9 +188,10 @@ directoryAddSongToStoredPlaylist(struct song *song, void *_data)
return 0;
}
-int addAllIn(const char *name)
+int
+addAllIn(struct player_control *pc, const char *name)
{
- return db_walk(name, directoryAddSongToPlaylist, NULL, NULL);
+ return db_walk(name, directoryAddSongToPlaylist, NULL, pc);
}
int addAllInToStoredPlaylist(const char *name, const char *utf8file)
@@ -205,7 +209,9 @@ findAddInDirectory(struct song *song, void *_data)
struct search_data *data = _data;
if (locate_song_match(song, data->criteria))
- return directoryAddSongToPlaylist(song, data);
+ return playlist_append_song(&g_playlist,
+ data->client->player_control,
+ song, NULL);
return 0;
}