Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Requests: Start/Stop Streaming/Recording request now have errors

Browse Source
This commit is contained in:
Palakis 2017-04-23 15:22:10 +02:00
parent d0118c63c0
commit d014a7ab25
2 changed files with 32 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PROTOCOL.md
View File

@ -491,7 +491,7 @@ __Response__ : always OK. No additional fields.
Start streaming. Start streaming.
__Request fields__ : none __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. Stop streaming.
__Request fields__ : none __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. Start recording.
__Request fields__ : none __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. Stop recording.
__Request fields__ : none __Request fields__ : none
__Response__ : always OK. No additional fields. __Response__ : Error if recording is already inactive, OK otherwise. No additional fields.
--- ---

36
WSRequestHandler.cpp
View File

@ -391,33 +391,53 @@ void WSRequestHandler::HandleStartStopRecording(WSRequestHandler *req)
void WSRequestHandler::HandleStartStreaming(WSRequestHandler *req) void WSRequestHandler::HandleStartStreaming(WSRequestHandler *req)
{ {
if (obs_frontend_streaming_active() == false) if (obs_frontend_streaming_active() == false)
{
obs_frontend_streaming_start(); obs_frontend_streaming_start();
req->SendOKResponse();
req->SendOKResponse(); }
else
{
req->SendErrorResponse("streaming already active");
}
} }
void WSRequestHandler::HandleStopStreaming(WSRequestHandler *req) void WSRequestHandler::HandleStopStreaming(WSRequestHandler *req)
{ {
if (obs_frontend_streaming_active() == true) if (obs_frontend_streaming_active() == true)
{
obs_frontend_streaming_stop(); obs_frontend_streaming_stop();
req->SendOKResponse();
req->SendOKResponse(); }
else
{
req->SendErrorResponse("streaming not active");
}
} }
void WSRequestHandler::HandleStartRecording(WSRequestHandler *req) void WSRequestHandler::HandleStartRecording(WSRequestHandler *req)
{ {
if (obs_frontend_recording_active() == false) if (obs_frontend_recording_active() == false)
{
obs_frontend_recording_start(); obs_frontend_recording_start();
req->SendOKResponse();
req->SendOKResponse(); }
else
{
req->SendErrorResponse("recording already active");
}
} }
void WSRequestHandler::HandleStopRecording(WSRequestHandler *req) void WSRequestHandler::HandleStopRecording(WSRequestHandler *req)
{ {
if (obs_frontend_recording_active() == true) if (obs_frontend_recording_active() == true)
{
obs_frontend_recording_stop(); obs_frontend_recording_stop();
req->SendOKResponse();
req->SendOKResponse(); }
else
{
req->SendErrorResponse("recording not active");
}
} }
void WSRequestHandler::HandleGetTransitionList(WSRequestHandler *req) void WSRequestHandler::HandleGetTransitionList(WSRequestHandler *req)