From 9c637df77ec245518922c5aeb076ae52c89598d0 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Tue, 4 Feb 2014 01:15:08 +0100 Subject: SongSticker: add Database reference parameter --- src/sticker/SongSticker.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/sticker/SongSticker.cxx') diff --git a/src/sticker/SongSticker.cxx b/src/sticker/SongSticker.cxx index 4bcc8979f..7246ec69f 100644 --- a/src/sticker/SongSticker.cxx +++ b/src/sticker/SongSticker.cxx @@ -21,7 +21,6 @@ #include "SongSticker.hxx" #include "StickerDatabase.hxx" #include "db/LightSong.hxx" -#include "db/DatabaseGlue.hxx" #include "db/DatabasePlugin.hxx" #include "util/Error.hxx" @@ -95,15 +94,13 @@ sticker_song_find_cb(const char *uri, const char *value, void *user_data) } bool -sticker_song_find(const char *base_uri, const char *name, +sticker_song_find(const Database &db, const char *base_uri, const char *name, void (*func)(const LightSong &song, const char *value, void *user_data), void *user_data) { struct sticker_song_find_data data; - data.db = GetDatabase(); - assert(data.db != nullptr); - + data.db = &db; data.func = func; data.user_data = user_data; -- cgit v1.2.3