diff options
| author | Max Kellermann <max@duempel.org> | 2014-02-01 00:26:34 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2014-02-04 11:22:33 +0100 |
| commit | cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9 (patch) | |
| tree | 7368011b1ecf5ae6db6dcafb676fddf03ff9d823 /src/command | |
| parent | f00710a57e80738c33255eaa1347ab776fbce869 (diff) | |
| download | mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.tar.gz mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.tar.xz mpd-cf6281a5a758e4b93d67f7fd5804a8cff60ddbf9.zip | |
Instance: add Database attribute
Move from db/DatabaseGlue.cxx, eliminating global variable.
Diffstat (limited to 'src/command')
| -rw-r--r-- | src/command/DatabaseCommands.cxx | 2 | ||||
| -rw-r--r-- | src/command/PlaylistCommands.cxx | 3 | ||||
| -rw-r--r-- | src/command/StickerCommands.cxx | 5 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/command/DatabaseCommands.cxx b/src/command/DatabaseCommands.cxx index b458b3756..ef6fb922e 100644 --- a/src/command/DatabaseCommands.cxx +++ b/src/command/DatabaseCommands.cxx @@ -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); diff --git a/src/command/PlaylistCommands.cxx b/src/command/PlaylistCommands.cxx index 07cc177d6..0997cc68d 100644 --- a/src/command/PlaylistCommands.cxx +++ b/src/command/PlaylistCommands.cxx @@ -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); diff --git a/src/command/StickerCommands.cxx b/src/command/StickerCommands.cxx index 9e526b0e0..bf3660b85 100644 --- a/src/command/StickerCommands.cxx +++ b/src/command/StickerCommands.cxx @@ -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); |