(split) Renamed SHOW into OUTPUT_WITH_ID

src/impl/ServicesImpl.cpp

@@ -168,13 +168,13 @@ std::string ServicesImpl::createStreamStatusRequest() const {
 	return request.toString();
 }
 
-std::string ServicesImpl::createShowStreamRequest(int id) const {
+std::string ServicesImpl::createOutputWithIdRequest(int id) const {
 
 	json::StringObject request;
 	request.pushKey(message::TYPE);
-	request.pushInt(message::SHOW);
+	request.pushInt(message::OUTPUT_WITH_ID);
 
-	request.pushKey(message::ShowStreamRequest::ID);
+	request.pushKey(message::OutputWithIdRequest::ID);
 	request.pushInt(id);
 
 	return request.toString();

src/impl/ServicesImpl.h

@@ -68,7 +68,7 @@ public:
 	zmq::socket_t * createCancelPublisher(const std::string& endpoint);
 	zmq::socket_t * createRequestSocket(const std::string& endpoint);
 
-	std::string createShowStreamRequest(int id) const;
+	std::string createOutputWithIdRequest(int id) const;
 
 	bool isAvailable(RequestSocketImpl * socket, int timeout);
 	void waitForSubscriber(zmq::socket_t * subscriber, RequestSocketImpl * socket);

src/message/Message.h

@@ -30,14 +30,14 @@ namespace message {
 	const int STOP = 3;
 	const int CONNECT = 4;
 	const int APPS = 5;
-	const int SHOW = 6;
-	const int ENABLE_STREAM = 7;
-	const int IS_ALIVE = 8;
-	const int SEND_PARAMETERS = 9;
-	const int KILL = 10;
-	const int STATUS = 11;
-	const int ALL_AVAILABLE = 12;
-	const int OUTPUT = 13;
+	const int OUTPUT_WITH_ID = 6;
+	const int OUTPUT = 7;
+	const int ENABLE_STREAM = 8;
+	const int IS_ALIVE = 9;
+	const int SEND_PARAMETERS = 10;
+	const int KILL = 11;
+	const int STATUS = 12;
+	const int ALL_AVAILABLE = 13;
 	const int SET_STATUS = 14;
 	const int GET_STATUS = 15;
 	const int CREATE_PUBLISHER = 16;
@@ -139,10 +139,14 @@ namespace message {
 		constexpr const char* APPLICATION_INFO = "applicationInfo"; // repeated ApplicationInfo applicationInfo = 1;
 	}
 
-	namespace ShowStreamRequest {
+	namespace OutputWithIdRequest {
 		constexpr const char* ID = "id"; // required int32 id = 1;
 	}
 
+	namespace OutputRequest {
+		constexpr const char* NAME = "name"; // required string name = 1;
+	}
+
 	namespace IsAliveRequest {
 		constexpr const char* ID = "id"; // required int32 id = 1;
 	}
@@ -166,10 +170,6 @@ namespace message {
 		constexpr const char* ID = "id"; // required int32 id = 1;
 	}
 
-	namespace OutputRequest {
-		constexpr const char* NAME = "name"; // required string name = 1;
-	}
-
 	namespace SetStatusRequest {
 		constexpr const char* ID = "id"; // required int32 id = 1;
 		constexpr const char* APPLICATION_STATE = "applicationState"; // required int32 applicationState = 2;