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

config holds list of clients

Browse source
This commit is contained in:
badaix 2015-09-01 22:19:46 +02:00
parent 3a0b856afe
commit 707f198a26
3 changed files with 56 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

25
server/config.h
View file

@ -20,6 +20,8 @@
#define CONFIG_H
#include <string>
#include <memory>
#include <vector>
#include <sys/time.h>
#include "json.hpp"
@ -41,6 +43,12 @@ T jGet(json j, const std::string& what, const T& def)
struct ClientInfo
{
ClientInfo(const std::string& _macAddress = "") : macAddress(_macAddress), volume(1.0), connected(false)
{
lastSeen.tv_sec = 0;
lastSeen.tv_usec = 0;
}
void fromJson(const json& j)
{
macAddress = jGet<std::string>(j, "MAC", "");
@ -61,7 +69,7 @@ struct ClientInfo
j["IP"] = ipAddress;
j["host"] = hostName;
j["version"] = version;
j["name"] = name;
j["name"] = getName();
j["volume"] = volume;
j["lastSeen"]["sec"] = lastSeen.tv_sec;
j["lastSeen"]["usec"] = lastSeen.tv_usec;
@ -69,6 +77,14 @@ struct ClientInfo
return j;
}
std::string getName()
{
if (name.empty())
return hostName;
else
return name;
}
std::string macAddress;
std::string ipAddress;
std::string hostName;
@ -79,6 +95,8 @@ struct ClientInfo
bool connected;
};
typedef std::shared_ptr<ClientInfo> ClientInfoPtr;
class Config
{
@ -90,11 +108,14 @@ public:
}
void test();
ClientInfoPtr getClientInfo(const std::string& mac);
std::vector<ClientInfoPtr> clients;
json getClientInfos() const;
private:
Config();
};