Skip to content

Commit 3ea3d32

Browse files
exeldroLain-B
authored andcommitted
requesthandler: Update scene item transform API
Updates: obs_sceneitem_get_info to obs_sceneitem_get_info2 obs_sceneitem_set_info to obs_sceneitem_set_info2 Ensures that we're using the latest versions of these functions in order to prevent future deprecation
1 parent e94f919 commit 3ea3d32

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/requesthandler/RequestHandler_SceneItems.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ RequestResult RequestHandler::DuplicateSceneItem(const Request &request)
308308
bool sceneItemEnabled = obs_sceneitem_visible(sceneItem);
309309
obs_transform_info sceneItemTransform;
310310
obs_sceneitem_crop sceneItemCrop;
311-
obs_sceneitem_get_info(sceneItem, &sceneItemTransform);
311+
obs_sceneitem_get_info2(sceneItem, &sceneItemTransform);
312312
obs_sceneitem_get_crop(sceneItem, &sceneItemCrop);
313313

314314
// Create the new item
@@ -386,7 +386,7 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request &request)
386386
bool cropChanged = false;
387387
obs_transform_info sceneItemTransform;
388388
obs_sceneitem_crop sceneItemCrop;
389-
obs_sceneitem_get_info(sceneItem, &sceneItemTransform);
389+
obs_sceneitem_get_info2(sceneItem, &sceneItemTransform);
390390
obs_sceneitem_get_crop(sceneItem, &sceneItemCrop);
391391

392392
OBSSource source = obs_sceneitem_get_source(sceneItem);
@@ -503,7 +503,7 @@ RequestResult RequestHandler::SetSceneItemTransform(const Request &request)
503503
return RequestResult::Error(RequestStatus::CannotAct, "You have not provided any valid transform changes.");
504504

505505
if (transformChanged)
506-
obs_sceneitem_set_info(sceneItem, &sceneItemTransform);
506+
obs_sceneitem_set_info2(sceneItem, &sceneItemTransform);
507507

508508
if (cropChanged)
509509
obs_sceneitem_set_crop(sceneItem, &sceneItemCrop);

src/utils/Obs_ActionHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ static void CreateSceneItemHelper(void *_data, obs_scene_t *scene)
3333
data->sceneItem = obs_scene_add(scene, data->source);
3434

3535
if (data->sceneItemTransform)
36-
obs_sceneitem_set_info(data->sceneItem, data->sceneItemTransform);
36+
obs_sceneitem_set_info2(data->sceneItem, data->sceneItemTransform);
3737

3838
if (data->sceneItemCrop)
3939
obs_sceneitem_set_crop(data->sceneItem, data->sceneItemCrop);

src/utils/Obs_ObjectHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ json Utils::Obs::ObjectHelper::GetSceneItemTransform(obs_sceneitem_t *item)
5050

5151
obs_transform_info osi;
5252
obs_sceneitem_crop crop;
53-
obs_sceneitem_get_info(item, &osi);
53+
obs_sceneitem_get_info2(item, &osi);
5454
obs_sceneitem_get_crop(item, &crop);
5555

5656
OBSSource source = obs_sceneitem_get_source(item);

0 commit comments

Comments
 (0)