From d014a7ab25e483b45e7b080ad7fdc1b4e5b30cb1 Mon Sep 17 00:00:00 2001
From: Palakis <contact@slepin.fr>
Date: Sun, 23 Apr 2017 15:22:10 +0200
Subject: [PATCH] Requests: Start/Stop Streaming/Recording request now have
 errors

---
 PROTOCOL.md          |  8 ++++----
 WSRequestHandler.cpp | 36 ++++++++++++++++++++++++++++--------
 2 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/PROTOCOL.md b/PROTOCOL.md
index f8c1614d..e6007d18 100644
--- a/PROTOCOL.md
+++ b/PROTOCOL.md
@@ -491,7 +491,7 @@ __Response__ : always OK. No additional fields.
 Start streaming.
 
 __Request fields__ : none  
-__Response__ : always OK. No additional fields.  
+__Response__ : Error if streaming is already active, OK otherwise. No additional fields.  
 
 ---
 
@@ -499,7 +499,7 @@ __Response__ : always OK. No additional fields.
 Stop streaming.
 
 __Request fields__ : none  
-__Response__ : always OK. No additional fields.  
+__Response__ : Error if streaming is already inactive, OK otherwise. No additional fields.  
 
 ---
 
@@ -507,7 +507,7 @@ __Response__ : always OK. No additional fields.
 Start recording.
 
 __Request fields__ : none  
-__Response__ : always OK. No additional fields.  
+__Response__ : Error if recording is already active, OK otherwise. No additional fields.  
 
 ---
 
@@ -515,7 +515,7 @@ __Response__ : always OK. No additional fields.
 Stop recording.
 
 __Request fields__ : none  
-__Response__ : always OK. No additional fields.  
+__Response__ : Error if recording is already inactive, OK otherwise. No additional fields.  
 
 ---
 
diff --git a/WSRequestHandler.cpp b/WSRequestHandler.cpp
index 67eb67b9..2e581c38 100644
--- a/WSRequestHandler.cpp
+++ b/WSRequestHandler.cpp
@@ -391,33 +391,53 @@ void WSRequestHandler::HandleStartStopRecording(WSRequestHandler *req)
 void WSRequestHandler::HandleStartStreaming(WSRequestHandler *req)
 {
 	if (obs_frontend_streaming_active() == false)
+	{
 		obs_frontend_streaming_start();
-
-	req->SendOKResponse();
+		req->SendOKResponse();
+	}
+	else
+	{
+		req->SendErrorResponse("streaming already active");
+	}
 }
 
 void WSRequestHandler::HandleStopStreaming(WSRequestHandler *req)
 {
 	if (obs_frontend_streaming_active() == true)
+	{
 		obs_frontend_streaming_stop();
-
-	req->SendOKResponse();
+		req->SendOKResponse();
+	}
+	else
+	{
+		req->SendErrorResponse("streaming not active");
+	}
 }
 
 void WSRequestHandler::HandleStartRecording(WSRequestHandler *req)
 {
 	if (obs_frontend_recording_active() == false)
+	{
 		obs_frontend_recording_start();
-
-	req->SendOKResponse();
+		req->SendOKResponse();
+	}
+	else
+	{
+		req->SendErrorResponse("recording already active");
+	}
 }
 
 void WSRequestHandler::HandleStopRecording(WSRequestHandler *req)
 {
 	if (obs_frontend_recording_active() == true)
+	{
 		obs_frontend_recording_stop();
-
-	req->SendOKResponse();
+		req->SendOKResponse();
+	}
+	else
+	{
+		req->SendErrorResponse("recording not active");
+	}
 }
 
 void WSRequestHandler::HandleGetTransitionList(WSRequestHandler *req)