3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-05-22 13:36:18 +02:00
Code Issues Projects Releases Packages Wiki Activity

Don't send client update as Client.Set response

Browse source
This commit is contained in:
badaix 2016-01-07 20:12:22 +01:00
parent 86f766721d
commit 506f179ed2
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
server/controlServer.cpp
View file

@ -44,7 +44,7 @@ ControlServer::~ControlServer()
} }
void ControlServer::send(const std::string& message) void ControlServer::send(const std::string& message, const ControlSession* excludeSession)
{ {
std::unique_lock<std::mutex> mlock(mutex_); std::unique_lock<std::mutex> mlock(mutex_);
for (auto it = sessions_.begin(); it != sessions_.end(); ) for (auto it = sessions_.begin(); it != sessions_.end(); )
@ -63,7 +63,10 @@ void ControlServer::send(const std::string& message)
} }
for (auto s : sessions_) for (auto s : sessions_)
s->sendAsync(message); {
if (s.get() != excludeSession)
s->sendAsync(message);
}
} }

2
server/controlServer.h
View file

@ -53,7 +53,7 @@ public:
void stop(); void stop();
/// Send a message to all connceted clients /// Send a message to all connceted clients
void send(const std::string& message); void send(const std::string& message, const ControlSession* excludeSession = NULL);
/// Clients call this when they receive a message. Implementation of MessageReceiver::onMessageReceived /// Clients call this when they receive a message. Implementation of MessageReceiver::onMessageReceived
virtual void onMessageReceived(ControlSession* connection, const std::string& message); virtual void onMessageReceived(ControlSession* connection, const std::string& message);

2
server/streamServer.cpp
View file

@ -196,7 +196,7 @@ void StreamServer::onMessageReceived(ControlSession* controlSession, const std::
Config::instance().save(); Config::instance().save();
json notification = JsonNotification::getJson("Client.OnUpdate", clientInfo->toJson()); json notification = JsonNotification::getJson("Client.OnUpdate", clientInfo->toJson());
controlServer_->send(notification.dump()); controlServer_->send(notification.dump(), controlSession);
} }
controlSession->send(request.getResponse(response).dump()); controlSession->send(request.getResponse(response).dump());