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

Client: make almost all attributes private

Browse Source
This commit is contained in:
Max Kellermann
2019-04-03 20:02:59 +02:00
parent 380f73c112
commit a9cb12b745
3 changed files with 28 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/command/MessageCommands.cxx
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2003-2018 The Music Player Daemon Project
* Copyright 2003-2019 The Music Player Daemon Project
* http://www.musicpd.org
*
* This program is free software; you can redistribute it and/or modify
@@ -78,9 +78,11 @@ handle_channels(Client &client, gcc_unused Request args, Response &r)
assert(args.empty());
std::set<std::string> channels;
for (const auto &c : *client.GetInstance().client_list)
channels.insert(c.subscriptions.begin(),
c.subscriptions.end());
for (const auto &c : *client.GetInstance().client_list) {
const auto &subscriptions = c.GetSubscriptions();
channels.insert(subscriptions.begin(),
subscriptions.end());
}
for (const auto &channel : channels)
r.Format("channel: %s\n", channel.c_str());
@@ -94,13 +96,10 @@ handle_read_messages(Client &client,
{
assert(args.empty());
while (!client.messages.empty()) {
const ClientMessage &msg = client.messages.front();
client.ConsumeMessages([&r](const auto &msg){
r.Format("channel: %s\nmessage: %s\n",
msg.GetChannel(), msg.GetMessage());
client.messages.pop_front();
}
});
return CommandResult::OK;
}