3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-25 15:06:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

added Volume struct

Browse source
This commit is contained in:
badaix 2015-09-02 18:44:09 +02:00
parent e5698d8ab1
commit 7ebefd85a4
2 changed files with 38 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
server/config.cpp
View file

@ -44,14 +44,20 @@ void Config::test()
} }
ClientInfoPtr Config::getClientInfo(const std::string& macAddress) ClientInfoPtr Config::getClientInfo(const std::string& macAddress, bool add)
{ {
if (macAddress.empty())
return nullptr;
for (auto client: clients) for (auto client: clients)
{ {
if (client->macAddress == macAddress) if (client->macAddress == macAddress)
return client; return client;
} }
if (!add)
return nullptr;
ClientInfoPtr client = make_shared<ClientInfo>(macAddress); ClientInfoPtr client = make_shared<ClientInfo>(macAddress);
clients.push_back(client); clients.push_back(client);

36
server/config.h
View file

@ -41,9 +41,34 @@ T jGet(json j, const std::string& what, const T& def)
} }
struct Volume
{
Volume(uint16_t _percent = 100, bool _muted = false) : percent(_percent), muted(_muted)
{
}
void fromJson(const json& j)
{
percent = jGet<uint16_t>(j, "percent", percent);
muted = jGet<bool>(j, "muted", muted);
}
json toJson()
{
json j;
j["percent"] = percent;
j["muted"] = muted;
return j;
}
uint16_t percent;
bool muted;
};
struct ClientInfo struct ClientInfo
{ {
ClientInfo(const std::string& _macAddress = "") : macAddress(_macAddress), volume(1.0), connected(false) ClientInfo(const std::string& _macAddress = "") : macAddress(_macAddress), volume(100), connected(false)
{ {
lastSeen.tv_sec = 0; lastSeen.tv_sec = 0;
lastSeen.tv_usec = 0; lastSeen.tv_usec = 0;
@ -56,7 +81,7 @@ struct ClientInfo
hostName = jGet<std::string>(j, "host", ""); hostName = jGet<std::string>(j, "host", "");
version = jGet<std::string>(j, "version", ""); version = jGet<std::string>(j, "version", "");
name = jGet<std::string>(j, "name", ""); name = jGet<std::string>(j, "name", "");
volume = jGet<double>(j, "volume", 1.0); volume.fromJson(j["volume"]);
lastSeen.tv_sec = jGet<int32_t>(j["lastSeen"], "sec", 0); lastSeen.tv_sec = jGet<int32_t>(j["lastSeen"], "sec", 0);
lastSeen.tv_usec = jGet<int32_t>(j["lastSeen"], "usec", 0); lastSeen.tv_usec = jGet<int32_t>(j["lastSeen"], "usec", 0);
connected = jGet<bool>(j, "connected", true); connected = jGet<bool>(j, "connected", true);
@ -70,7 +95,7 @@ struct ClientInfo
j["host"] = hostName; j["host"] = hostName;
j["version"] = version; j["version"] = version;
j["name"] = getName(); j["name"] = getName();
j["volume"] = volume; j["volume"] = volume.toJson();
j["lastSeen"]["sec"] = lastSeen.tv_sec; j["lastSeen"]["sec"] = lastSeen.tv_sec;
j["lastSeen"]["usec"] = lastSeen.tv_usec; j["lastSeen"]["usec"] = lastSeen.tv_usec;
j["connected"] = connected; j["connected"] = connected;
@ -90,7 +115,8 @@ struct ClientInfo
std::string hostName; std::string hostName;
std::string version; std::string version;
std::string name; std::string name;
double volume; Volume volume;
bool muted;
timeval lastSeen; timeval lastSeen;
bool connected; bool connected;
}; };
@ -108,7 +134,7 @@ public:
} }
void test(); void test();
ClientInfoPtr getClientInfo(const std::string& mac); ClientInfoPtr getClientInfo(const std::string& mac, bool add = true);
std::vector<ClientInfoPtr> clients; std::vector<ClientInfoPtr> clients;
json getClientInfos() const; json getClientInfos() const;