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

Instance: add Database attribute

Browse Source 
Move from db/DatabaseGlue.cxx, eliminating global variable.
This commit is contained in:
Max Kellermann
2014-02-01 00:26:34 +01:00
parent f00710a57e
commit cf6281a5a7
21 changed files with 106 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/command/DatabaseCommands.cxx
View File

@@ -120,7 +120,7 @@ handle_searchaddpl(Client &client, int argc, char *argv[])
}
Error error;
const Database *db = GetDatabase(error);
const Database *db = client.GetDatabase(error);
if (db == nullptr)
return print_error(client, error);

3
src/command/PlaylistCommands.cxx
View File

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

5
src/command/StickerCommands.cxx
View File

@@ -28,6 +28,9 @@
#include "sticker/StickerDatabase.hxx"
#include "CommandError.hxx"
#include "protocol/Result.hxx"
#include "client/Client.hxx"
#include "Partition.hxx"
#include "Instance.hxx"
#include "util/Error.hxx"
#include <string.h>
@@ -52,7 +55,7 @@ static CommandResult
handle_sticker_song(Client &client, int argc, char *argv[])
{
Error error;
const Database *db = GetDatabase(error);
const Database *db = client.GetDatabase(error);
if (db == nullptr)
return print_error(client, error);