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: Add DuplicateSceneItem

Browse Source
This commit is contained in:
tt2468
2021-11-12 17:31:11 -08:00
parent aa46bb74a5
commit 45f7661a5d
3 changed files with 46 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/requesthandler/RequestHandler.cpp
View File

@ -72,6 +72,7 @@ const std::map<std::string, RequestMethodHandler> RequestHandler::_handlerMap
{"GetSceneItemId", &RequestHandler::GetSceneItemId}, {"GetSceneItemId", &RequestHandler::GetSceneItemId},
{"CreateSceneItem", &RequestHandler::CreateSceneItem}, {"CreateSceneItem", &RequestHandler::CreateSceneItem},
{"RemoveSceneItem", &RequestHandler::RemoveSceneItem}, {"RemoveSceneItem", &RequestHandler::RemoveSceneItem},
{"DuplicateSceneItem", &RequestHandler::DuplicateSceneItem},
{"GetSceneItemTransform", &RequestHandler::GetSceneItemTransform}, {"GetSceneItemTransform", &RequestHandler::GetSceneItemTransform},
{"GetSceneItemEnabled", &RequestHandler::GetSceneItemEnabled}, {"GetSceneItemEnabled", &RequestHandler::GetSceneItemEnabled},
{"SetSceneItemEnabled", &RequestHandler::SetSceneItemEnabled}, {"SetSceneItemEnabled", &RequestHandler::SetSceneItemEnabled},

1
src/requesthandler/RequestHandler.h
View File

@ -93,6 +93,7 @@ class RequestHandler {
RequestResult GetSceneItemId(const Request&); RequestResult GetSceneItemId(const Request&);
RequestResult CreateSceneItem(const Request&); RequestResult CreateSceneItem(const Request&);
RequestResult RemoveSceneItem(const Request&); RequestResult RemoveSceneItem(const Request&);
RequestResult DuplicateSceneItem(const Request&);
RequestResult GetSceneItemTransform(const Request&); RequestResult GetSceneItemTransform(const Request&);
RequestResult GetSceneItemEnabled(const Request&); RequestResult GetSceneItemEnabled(const Request&);
RequestResult SetSceneItemEnabled(const Request&); RequestResult SetSceneItemEnabled(const Request&);

44
src/requesthandler/RequestHandler_SceneItems.cpp
View File

@ -102,6 +102,50 @@ RequestResult RequestHandler::RemoveSceneItem(const Request& request)
return RequestResult::Success(); return RequestResult::Success();
} }
RequestResult RequestHandler::DuplicateSceneItem(const Request& request)
{
RequestStatus::RequestStatus statusCode;
std::string comment;
OBSSceneItemAutoRelease sceneItem = request.ValidateSceneItem("sceneName", "sceneItemId", statusCode, comment);
if (!sceneItem)
return RequestResult::Error(statusCode, comment);
// Get destination scene
obs_scene_t *destinationScene;
if (request.Contains("destinationSceneName")) {
destinationScene = request.ValidateScene2("destinationSceneName", statusCode, comment);
if (!destinationScene)
return RequestResult::Error(statusCode, comment);
} else {
destinationScene = obs_sceneitem_get_scene(sceneItem);
obs_scene_addref(destinationScene);
}
if (obs_sceneitem_is_group(sceneItem) && obs_sceneitem_get_scene(sceneItem) == destinationScene) {
obs_scene_release(destinationScene);
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Scenes may only have one instance of a group.");
}
// Get scene item details
OBSSource sceneItemSource = obs_sceneitem_get_source(sceneItem);
bool sceneItemEnabled = obs_sceneitem_visible(sceneItem);
obs_transform_info sceneItemTransform;
obs_sceneitem_crop sceneItemCrop;
obs_sceneitem_get_info(sceneItem, &sceneItemTransform);
obs_sceneitem_get_crop(sceneItem, &sceneItemCrop);
// Create the new item
OBSSceneItemAutoRelease newSceneItem = Utils::Obs::ActionHelper::CreateSceneItem(sceneItemSource, destinationScene, sceneItemEnabled, &sceneItemTransform, &sceneItemCrop);
obs_scene_release(destinationScene);
if (!newSceneItem)
return RequestResult::Error(RequestStatus::ResourceCreationFailed, "Failed to create the scene item.");
json responseData;
responseData["sceneItemId"] = obs_sceneitem_get_id(newSceneItem);
return RequestResult::Success(responseData);
}
RequestResult RequestHandler::GetSceneItemTransform(const Request& request) RequestResult RequestHandler::GetSceneItemTransform(const Request& request)
{ {
RequestStatus::RequestStatus statusCode; RequestStatus::RequestStatus statusCode;