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

replay buffer: start without "Save" hotkey set

Browse Source
This commit is contained in:
Palakis
2017-10-25 18:29:11 +02:00
parent fe644cfa82
commit c2937d7857
3 changed files with 34 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Utils.cpp
View File

@ -459,7 +459,36 @@ bool Utils::ReplayBufferEnabled() {
return false; return false;
} }
bool Utils::RPHotkeySet() { void Utils::StartReplayBuffer() {
if (obs_frontend_replay_buffer_active())
return;
if (!IsRPHotkeySet()) {
obs_output_t* rpOutput = obs_frontend_get_replay_buffer_output();
OBSData outputHotkeys = obs_hotkeys_save_output(rpOutput);
OBSData dummyBinding = obs_data_create();
obs_data_set_bool(dummyBinding, "control", true);
obs_data_set_bool(dummyBinding, "alt", true);
obs_data_set_bool(dummyBinding, "shift", true);
obs_data_set_bool(dummyBinding, "command", true);
obs_data_set_string(dummyBinding, "key", "OBS_KEY_0");
OBSDataArray rpSaveHotkey = obs_data_get_array(
outputHotkeys, "ReplayBuffer.Save");
obs_data_array_push_back(rpSaveHotkey, dummyBinding);
obs_hotkeys_load_output(rpOutput, outputHotkeys);
obs_frontend_replay_buffer_start();
obs_output_release(rpOutput);
}
else {
obs_frontend_replay_buffer_start();
}
}
bool Utils::IsRPHotkeySet() {
obs_output_t* rp_output = obs_frontend_get_replay_buffer_output(); obs_output_t* rp_output = obs_frontend_get_replay_buffer_output();
obs_data_t *hotkeys = obs_hotkeys_save_output(rp_output); obs_data_t *hotkeys = obs_hotkeys_save_output(rp_output);

3
Utils.h
View File

@ -73,7 +73,8 @@ class Utils {
static QString* ParseDataToQueryString(obs_data_t * data); static QString* ParseDataToQueryString(obs_data_t * data);
static obs_hotkey_t* FindHotkeyByName(const char* name); static obs_hotkey_t* FindHotkeyByName(const char* name);
static bool ReplayBufferEnabled(); static bool ReplayBufferEnabled();
static bool RPHotkeySet(); static void StartReplayBuffer();
static bool IsRPHotkeySet();
}; };
#endif // UTILS_H #endif // UTILS_H

13
WSRequestHandler.cpp
View File

@ -705,11 +705,7 @@ void WSRequestHandler::HandleStartStopReplayBuffer(WSRequestHandler* req) {
if (obs_frontend_replay_buffer_active()) { if (obs_frontend_replay_buffer_active()) {
obs_frontend_replay_buffer_stop(); obs_frontend_replay_buffer_stop();
} else { } else {
if (!Utils::RPHotkeySet()) { Utils::StartReplayBuffer();
req->SendErrorResponse("replay buffer hotkey not set");
return;
}
obs_frontend_replay_buffer_start();
} }
req->SendOKResponse(); req->SendOKResponse();
} }
@ -737,12 +733,7 @@ void WSRequestHandler::HandleStartReplayBuffer(WSRequestHandler* req) {
return; return;
} }
if (!Utils::RPHotkeySet()) { Utils::StartReplayBuffer();
req->SendErrorResponse("replay buffer hotkey not set");
return;
}
obs_frontend_replay_buffer_start();
req->SendOKResponse(); req->SendOKResponse();
} }