diff options
Diffstat (limited to '')
-rw-r--r-- | src/command/MessageCommands.cxx | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/command/MessageCommands.cxx b/src/command/MessageCommands.cxx index 7d9893e70..fe7500aaf 100644 --- a/src/command/MessageCommands.cxx +++ b/src/command/MessageCommands.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -19,12 +19,11 @@ #include "config.h" #include "MessageCommands.hxx" -#include "Client.hxx" -#include "ClientList.hxx" +#include "client/Client.hxx" +#include "client/ClientList.hxx" #include "Instance.hxx" -#include "Main.hxx" +#include "Partition.hxx" #include "protocol/Result.hxx" -#include "protocol/ArgParser.hxx" #include <set> #include <string> @@ -82,7 +81,7 @@ handle_channels(Client &client, assert(argc == 1); std::set<std::string> channels; - for (const auto &c : *instance->client_list) + for (const auto &c : *client.partition.instance.client_list) channels.insert(c->subscriptions.begin(), c->subscriptions.end()); @@ -123,7 +122,7 @@ handle_send_message(Client &client, bool sent = false; const ClientMessage msg(argv[1], argv[2]); - for (const auto &c : *instance->client_list) + for (const auto &c : *client.partition.instance.client_list) if (c->PushMessage(msg)) sent = true; |