From af52a26e68eac63ed596329b3c7dbf0f3805e87c Mon Sep 17 00:00:00 2001 From: tt2468 Date: Fri, 12 Nov 2021 17:29:43 -0800 Subject: [PATCH] Utils: Add ability to specify transform/crop for scene item creation --- src/utils/Obs.cpp | 19 +++++++++++++++---- src/utils/Obs.h | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/utils/Obs.cpp b/src/utils/Obs.cpp index 05b48dbd..238e8d74 100644 --- a/src/utils/Obs.cpp +++ b/src/utils/Obs.cpp @@ -447,19 +447,28 @@ obs_sceneitem_t *Utils::Obs::SearchHelper::GetSceneItemByName(obs_scene_t *scene } struct CreateSceneItemData { - obs_source_t *source; - bool sceneItemEnabled; - OBSSceneItem sceneItem; + obs_source_t *source; // In + bool sceneItemEnabled; // In + obs_transform_info *sceneItemTransform = nullptr; // In + obs_sceneitem_crop *sceneItemCrop = nullptr; // In + OBSSceneItem sceneItem; // Out }; void CreateSceneItemHelper(void *_data, obs_scene_t *scene) { auto *data = reinterpret_cast(_data); data->sceneItem = obs_scene_add(scene, data->source); + + if (data->sceneItemTransform) + obs_sceneitem_set_info(data->sceneItem, data->sceneItemTransform); + + if (data->sceneItemCrop) + obs_sceneitem_set_crop(data->sceneItem, data->sceneItemCrop); + obs_sceneitem_set_visible(data->sceneItem, data->sceneItemEnabled); } -obs_sceneitem_t *Utils::Obs::ActionHelper::CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled) +obs_sceneitem_t *Utils::Obs::ActionHelper::CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled, obs_transform_info *sceneItemTransform, obs_sceneitem_crop *sceneItemCrop) { // Sanity check for valid scene if (!(source && scene)) @@ -469,6 +478,8 @@ obs_sceneitem_t *Utils::Obs::ActionHelper::CreateSceneItem(obs_source_t *source, CreateSceneItemData data; data.source = source; data.sceneItemEnabled = sceneItemEnabled; + data.sceneItemTransform = sceneItemTransform; + data.sceneItemCrop = sceneItemCrop; // Enter graphics context and create the scene item obs_enter_graphics(); diff --git a/src/utils/Obs.h b/src/utils/Obs.h index 3845c082..d7a84ea1 100644 --- a/src/utils/Obs.h +++ b/src/utils/Obs.h @@ -67,7 +67,7 @@ namespace Utils { } namespace ActionHelper { - obs_sceneitem_t *CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled = true); // Increments ref. Use OBSSceneItemAutoRelease + obs_sceneitem_t *CreateSceneItem(obs_source_t *source, obs_scene_t *scene, bool sceneItemEnabled = true, obs_transform_info *sceneItemTransform = nullptr, obs_sceneitem_crop *sceneItemCrop = nullptr); // Increments ref. Use OBSSceneItemAutoRelease obs_sceneitem_t *CreateInput(std::string inputName, std::string inputKind, obs_data_t *inputSettings, obs_scene_t *scene, bool sceneItemEnabled = true); // Increments ref. Use OBSSceneItemAutoRelease } }