mirror of
https://github.com/Palakis/obs-websocket.git
synced 2024-08-30 18:12:16 +00:00
Utils: Add ability to specify transform/crop for scene item creation
This commit is contained in:
parent
69494d9c85
commit
af52a26e68
@ -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<CreateSceneItemData*>(_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();
|
||||
|
@ -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
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user