diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-04 23:19:46 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-04 23:19:46 +0100 |
| commit | bc1e8e01f3e6abaf2c3511ad82535046d6a7b05d (patch) | |
| tree | 80608056e427a42f31fc3ec7fb43b16c8ab7d803 /src/DatabaseQueue.cxx | |
| parent | fe8e77e556999fcaeaab1bb4a3555fd72529e2e0 (diff) | |
| download | mpd-bc1e8e01f3e6abaf2c3511ad82535046d6a7b05d.tar.gz mpd-bc1e8e01f3e6abaf2c3511ad82535046d6a7b05d.tar.xz mpd-bc1e8e01f3e6abaf2c3511ad82535046d6a7b05d.zip | |
DatabaseQueue: pass playlist object
Don't use the global variable "g_playlist".
Diffstat (limited to 'src/DatabaseQueue.cxx')
| -rw-r--r-- | src/DatabaseQueue.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/DatabaseQueue.cxx b/src/DatabaseQueue.cxx index 0b4d2bcb7..f808d25f6 100644 --- a/src/DatabaseQueue.cxx +++ b/src/DatabaseQueue.cxx @@ -27,10 +27,11 @@ #include <functional> static bool -AddToQueue(struct player_control *pc, song &song, GError **error_r) +AddToQueue(struct playlist &playlist, struct player_control *pc, + song &song, GError **error_r) { enum playlist_result result = - playlist_append_song(&g_playlist, pc, &song, NULL); + playlist_append_song(&playlist, pc, &song, NULL); if (result != PLAYLIST_RESULT_SUCCESS) { g_set_error(error_r, playlist_quark(), result, "Playlist error"); @@ -41,7 +42,8 @@ AddToQueue(struct player_control *pc, song &song, GError **error_r) } bool -findAddIn(struct player_control *pc, const char *uri, +findAddIn(struct playlist &playlist, struct player_control *pc, + const char *uri, const SongFilter *filter, GError **error_r) { const Database *db = GetDatabase(error_r); @@ -51,6 +53,6 @@ findAddIn(struct player_control *pc, const char *uri, const DatabaseSelection selection(uri, true, filter); using namespace std::placeholders; - const auto f = std::bind(AddToQueue, pc, _1, _2); + const auto f = std::bind(AddToQueue, playlist, pc, _1, _2); return db->Visit(selection, f, error_r); } |