oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

db/DatabasePlaylist: pass Database reference around

Browse Source 
Reduce global variable usage, move to frontend code.
This commit is contained in:
Max Kellermann
2014-02-01 01:11:50 +01:00
parent db69ceade6
commit 29072797ca
9 changed files with 53 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/command/DatabaseCommands.cxx
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "DatabaseCommands.hxx"
#include "db/DatabaseGlue.hxx"
#include "db/DatabaseQueue.hxx"
#include "db/DatabasePlaylist.hxx"
#include "db/DatabasePrint.hxx"
@@ -119,7 +120,11 @@ handle_searchaddpl(Client &client, int argc, char *argv[])
}
Error error;
return search_add_to_playlist("", playlist, &filter, error)
const Database *db = GetDatabase(error);
if (db == nullptr)
return print_error(client, error);
return search_add_to_playlist(*db, "", playlist, &filter, error)
? CommandResult::OK
: print_error(client, error);
}

7
src/command/PlaylistCommands.cxx
View File

@@ -19,6 +19,7 @@
#include "config.h"
#include "PlaylistCommands.hxx"
#include "db/DatabaseGlue.hxx"
#include "db/DatabasePlaylist.hxx"
#include "CommandError.hxx"
#include "PlaylistPrint.hxx"
@@ -192,7 +193,11 @@ handle_playlistadd(Client &client, gcc_unused int argc, char *argv[])
success = spl_append_uri(playlist, loader, uri, error);
} else {
#ifdef ENABLE_DATABASE
success = search_add_to_playlist(uri, playlist, nullptr,
const Database *db = GetDatabase(error);
if (db == nullptr)
return print_error(client, error);
success = search_add_to_playlist(*db, uri, playlist, nullptr,
error);
#else
success = false;