From 02ec52e7652f8c34e197e2da0e1f7333368d60ad Mon Sep 17 00:00:00 2001
From: badaix <snapcast@badaix.de>
Date: Sat, 12 Sep 2015 19:45:03 +0200
Subject: [PATCH] renamed "add" to "sendAsync"

---
 server/controlServer.cpp  | 2 +-
 server/controlSession.cpp | 2 +-
 server/controlSession.h   | 2 +-
 server/streamServer.cpp   | 8 ++++----
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/server/controlServer.cpp b/server/controlServer.cpp
index 04859719..22460bf6 100644
--- a/server/controlServer.cpp
+++ b/server/controlServer.cpp
@@ -64,7 +64,7 @@ void ControlServer::send(const std::string& message)
 	}
 
 	for (auto s : sessions_)
-		s->add(message);
+		s->sendAsync(message);
 }
 
 
diff --git a/server/controlSession.cpp b/server/controlSession.cpp
index 3b952867..1483a8cd 100644
--- a/server/controlSession.cpp
+++ b/server/controlSession.cpp
@@ -85,7 +85,7 @@ void ControlSession::stop()
 
 
 
-void ControlSession::add(const std::string& message)
+void ControlSession::sendAsync(const std::string& message)
 {
 	messages_.push(message);
 }
diff --git a/server/controlSession.h b/server/controlSession.h
index 6665f590..57bc9fb9 100644
--- a/server/controlSession.h
+++ b/server/controlSession.h
@@ -64,7 +64,7 @@ public:
 	bool send(const std::string& message) const;
 
 	/// Sends a message to the client (asynchronous)
-	void add(const std::string& message);
+	void sendAsync(const std::string& message);
 
 	bool active() const
 	{
diff --git a/server/streamServer.cpp b/server/streamServer.cpp
index be902fb9..6099abba 100644
--- a/server/streamServer.cpp
+++ b/server/streamServer.cpp
@@ -93,7 +93,7 @@ void StreamServer::onDisconnect(ClientSession* connection)
 }
 
 
-void StreamServer::onMessageReceived(ControlSession* connection, const std::string& message)
+void StreamServer::onMessageReceived(ControlSession* controlSession, const std::string& message)
 {
 	JsonRequest request;
 	try
@@ -171,16 +171,16 @@ void StreamServer::onMessageReceived(ControlSession* connection, const std::stri
 			controlServer_->send(notification.dump());
 		}
 
-		connection->send(request.getResponse(response).dump());
+		controlSession->send(request.getResponse(response).dump());
 	}
 	catch (const JsonRequestException& e)
 	{
-		connection->send(e.getResponse().dump());
+		controlSession->send(e.getResponse().dump());
 	}
 	catch (const exception& e)
 	{
 		JsonInternalErrorException jsonException(e.what(), request.id);
-		connection->send(jsonException.getResponse().dump());
+		controlSession->send(jsonException.getResponse().dump());
 	}
 }