浏览代码

libobs: Remove v1 scene item transform API

Deprecated since 4b138f674f982c1b85487ff0cf6e3cabd27a76b4 (30.1).
Sebastian Beckmann 2 月之前
父节点
当前提交
b7c399f6d8
共有 4 个文件被更改,包括 2 次插入26 次删除
  1. 2 2
      docs/sphinx/frontends.rst
  2. 0 7
      docs/sphinx/reference-scenes.rst
  3. 0 15
      libobs/obs-scene.c
  4. 0 2
      libobs/obs.h

+ 2 - 2
docs/sphinx/frontends.rst

@@ -189,8 +189,8 @@ use a bounding box, you call the
 :c:func:`obs_sceneitem_set_bounds()`, and
 :c:func:`obs_sceneitem_set_bounds()`, and
 :c:func:`obs_sceneitem_set_bounds_alignment()`.  Though the easiest way
 :c:func:`obs_sceneitem_set_bounds_alignment()`.  Though the easiest way
 to handle everything related to transforms is to use the
 to handle everything related to transforms is to use the
-:c:func:`obs_sceneitem_set_info()` and
-:c:func:`obs_sceneitem_get_info()` functions.  See
+:c:func:`obs_sceneitem_set_info2()` and
+:c:func:`obs_sceneitem_get_info2()` functions.  See
 :ref:`scene_item_reference` for all the functions related to scene
 :ref:`scene_item_reference` for all the functions related to scene
 items.
 items.
 
 

+ 0 - 7
docs/sphinx/reference-scenes.rst

@@ -444,13 +444,6 @@ Scene Item Functions
 
 
 ---------------------
 ---------------------
 
 
-.. function:: void obs_sceneitem_set_info(obs_sceneitem_t *item, const struct obs_transform_info *info)
-              void obs_sceneitem_get_info(const obs_sceneitem_t *item, struct obs_transform_info *info)
-
-   Sets/gets the transform information of the scene item.
-
----------------------
-
 .. function:: void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info)
 .. function:: void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info)
               void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info)
               void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info)
 
 

+ 0 - 15
libobs/obs-scene.c

@@ -3040,13 +3040,6 @@ static inline void scene_item_get_info_internal(const obs_sceneitem_t *item, str
 	info->bounds_alignment = item->bounds_align;
 	info->bounds_alignment = item->bounds_align;
 }
 }
 
 
-void obs_sceneitem_get_info(const obs_sceneitem_t *item, struct obs_transform_info *info)
-{
-	if (item && info) {
-		scene_item_get_info_internal(item, info);
-	}
-}
-
 void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info)
 void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info)
 {
 {
 	if (item && info) {
 	if (item && info) {
@@ -3077,14 +3070,6 @@ static inline void scene_item_set_info_internal(obs_sceneitem_t *item, const str
 	item->bounds_align = info->bounds_alignment;
 	item->bounds_align = info->bounds_alignment;
 }
 }
 
 
-void obs_sceneitem_set_info(obs_sceneitem_t *item, const struct obs_transform_info *info)
-{
-	if (item && info) {
-		scene_item_set_info_internal(item, info);
-		do_update_transform(item);
-	}
-}
-
 void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info)
 void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info)
 {
 {
 	if (item && info) {
 	if (item && info) {

+ 0 - 2
libobs/obs.h

@@ -1717,8 +1717,6 @@ EXPORT uint32_t obs_sceneitem_get_bounds_alignment(const obs_sceneitem_t *item);
 EXPORT bool obs_sceneitem_get_bounds_crop(const obs_sceneitem_t *item);
 EXPORT bool obs_sceneitem_get_bounds_crop(const obs_sceneitem_t *item);
 EXPORT void obs_sceneitem_get_bounds(const obs_sceneitem_t *item, struct vec2 *bounds);
 EXPORT void obs_sceneitem_get_bounds(const obs_sceneitem_t *item, struct vec2 *bounds);
 
 
-OBS_DEPRECATED EXPORT void obs_sceneitem_get_info(const obs_sceneitem_t *item, struct obs_transform_info *info);
-OBS_DEPRECATED EXPORT void obs_sceneitem_set_info(obs_sceneitem_t *item, const struct obs_transform_info *info);
 EXPORT void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info);
 EXPORT void obs_sceneitem_get_info2(const obs_sceneitem_t *item, struct obs_transform_info *info);
 EXPORT void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info);
 EXPORT void obs_sceneitem_set_info2(obs_sceneitem_t *item, const struct obs_transform_info *info);