3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-07-24 03:48:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

renamed ClientInfo::clientId to ClientInfo::id

Browse source
This commit is contained in:
badaix 2016-12-03 14:12:56 +01:00
parent a860f60f0c
commit 07f395395b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
server/config.cpp
View file

@ -56,7 +56,7 @@ Config::Config()
{
GroupPtr group = make_shared<Group>();
group->fromJson(*it);
// if (client->clientId.empty() || getClientInfo(client->clientId))
// if (client->id.empty() || getClientInfo(client->id))
// continue;
groups.push_back(group);
}
@ -95,7 +95,7 @@ ClientInfoPtr Config::getClientInfo(const std::string& clientId) const
for (auto client: clients)
{
if (client->clientId == clientId)
if (client->id == clientId)
return client;
}
@ -122,7 +122,7 @@ GroupPtr Config::getGroup(ClientInfoPtr client)
{
for (auto c: group->clients)
{
if (c->clientId == client->clientId)
if (c->id == client->id)
return group;
}
}

8
server/config.h
View file

@ -216,7 +216,7 @@ struct Snapserver : public Snapcast
struct ClientInfo
{
ClientInfo(const std::string& _clientId = "") : clientId(_clientId), connected(false)
ClientInfo(const std::string& _clientId = "") : id(_clientId), connected(false)
{
lastSeen.tv_sec = 0;
lastSeen.tv_usec = 0;
@ -225,7 +225,7 @@ struct ClientInfo
void fromJson(const json& j)
{
host.fromJson(j["host"]);
clientId = jGet<std::string>(j, "id", host.mac);
id = jGet<std::string>(j, "id", host.mac);
snapclient.fromJson(j["snapclient"]);
config.fromJson(j["config"]);
lastSeen.tv_sec = jGet<int32_t>(j["lastSeen"], "sec", 0);
@ -236,7 +236,7 @@ struct ClientInfo
json toJson()
{
json j;
j["id"] = clientId;
j["id"] = id;
j["host"] = host.toJson();
j["snapclient"] = snapclient.toJson();
j["config"] = config.toJson();
@ -246,7 +246,7 @@ struct ClientInfo
return j;
}
std::string clientId;
std::string id;
Host host;
Snapclient snapclient;
ClientConfig config;