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

Add ReleaseTBar request and update SetTBarPosition to depend on OBS pr 2927

Browse Source
This commit is contained in:
tt2468 2020-05-13 00:10:57 -07:00
parent 4eb7bed2ff
commit 10ed2738f5
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/WSRequestHandler.cpp
View File

@ -84,6 +84,7 @@ const QHash<QString, RpcMethodHandler> WSRequestHandler::messageMap {
{ "SetCurrentTransition", &WSRequestHandler::SetCurrentTransition }, { "SetCurrentTransition", &WSRequestHandler::SetCurrentTransition },
{ "SetTransitionDuration", &WSRequestHandler::SetTransitionDuration }, { "SetTransitionDuration", &WSRequestHandler::SetTransitionDuration },
{ "GetTransitionDuration", &WSRequestHandler::GetTransitionDuration }, { "GetTransitionDuration", &WSRequestHandler::GetTransitionDuration },
{ "ReleaseTBar", &WSRequestHandler::ReleaseTBar },
{ "SetTBarPosition", &WSRequestHandler::SetTBarPosition }, { "SetTBarPosition", &WSRequestHandler::SetTBarPosition },
{ "GetTransitionPosition", &WSRequestHandler::GetTransitionPosition }, { "GetTransitionPosition", &WSRequestHandler::GetTransitionPosition },

1
src/WSRequestHandler.h
View File

@ -101,6 +101,7 @@ class WSRequestHandler {
RpcResponse SetCurrentTransition(const RpcRequest&); RpcResponse SetCurrentTransition(const RpcRequest&);
RpcResponse SetTransitionDuration(const RpcRequest&); RpcResponse SetTransitionDuration(const RpcRequest&);
RpcResponse GetTransitionDuration(const RpcRequest&); RpcResponse GetTransitionDuration(const RpcRequest&);
RpcResponse ReleaseTBar(const RpcRequest&);
RpcResponse SetTBarPosition(const RpcRequest&); RpcResponse SetTBarPosition(const RpcRequest&);
RpcResponse GetTransitionPosition(const RpcRequest&); RpcResponse GetTransitionPosition(const RpcRequest&);

41
src/WSRequestHandler_Transitions.cpp
View File

@ -121,6 +121,28 @@ RpcResponse WSRequestHandler::GetTransitionDuration(const RpcRequest& request) {
return request.success(response); return request.success(response);
} }
/**
* Release the T-Bar. YOU MUST CALL THIS IF YOU SPECIFY `release = false` IN `SetTBarPosition`.
*
* @api requests
* @name ReleaseTBar
* @category transitions
* @since 4.8.0
*/
RpcResponse WSRequestHandler::ReleaseTBar(const RpcRequest& request) {
if (!obs_frontend_preview_program_mode_active()) {
return request.failed("studio mode not enabled");
}
if (obs_transition_fixed(obs_frontend_get_current_transition())) {
return request.failed("current transition doesn't support t-bar control");
}
obs_frontend_release_tbar();
return request.success();
}
/** /**
* Set the manual position of the T-Bar (in Studio Mode) to the specified value. Will return an error if OBS is not in studio mode * Set the manual position of the T-Bar (in Studio Mode) to the specified value. Will return an error if OBS is not in studio mode
* or if the current transition doesn't support T-Bar control. * or if the current transition doesn't support T-Bar control.
@ -137,17 +159,28 @@ RpcResponse WSRequestHandler::SetTBarPosition(const RpcRequest& request) {
return request.failed("studio mode not enabled"); return request.failed("studio mode not enabled");
} }
OBSSourceAutoRelease currentTransition = obs_frontend_get_current_transition(); if (obs_transition_fixed(obs_frontend_get_current_transition())) {
if (obs_transition_fixed(currentTransition)) {
return request.failed("current transition doesn't support t-bar control"); return request.failed("current transition doesn't support t-bar control");
} }
if (!request.hasField("position")) {
return request.failed("missing request parameters");
}
double position = obs_data_get_double(request.parameters(), "position"); double position = obs_data_get_double(request.parameters(), "position");
if (position < 0.0 || position > 1.0) { if (position < 0.0 || position > 1.0) {
return request.failed("position is out of range"); return request.failed("position is out of range");
} }
obs_transition_set_manual_time(currentTransition, position); bool release = true;
if (request.hasField("release")) {
release = obs_data_get_bool(request.parameters(), "release");
}
obs_frontend_set_tbar_position((int)((float)position * 1024.0));
if (release) {
obs_frontend_release_tbar();
}
return request.success(); return request.success();
} }