Просмотр исходного кода

docs,libobs: Remove/internalize deprecated addref functions

These have been deprecated for external users since 27.2 (early 2022)
and only two are still in use internally.
derrod 1 год назад
Родитель
Сommit
71d49b0ef2

+ 0 - 9
docs/sphinx/reference-encoders.rst

@@ -351,15 +351,6 @@ General Encoder Functions
 
 ---------------------
 
-.. function:: void obs_encoder_addref(obs_encoder_t *encoder)
-
-   Adds a reference to an encoder.
-
-.. deprecated:: 27.2.0
-   Use :c:func:`obs_encoder_get_ref()` instead.
-
----------------------
-
 .. function:: obs_encoder_t *obs_encoder_get_ref(obs_encoder_t *encoder)
 
    Returns an incremented reference if still valid, otherwise returns

+ 0 - 9
docs/sphinx/reference-outputs.rst

@@ -343,15 +343,6 @@ General Output Functions
 
 ---------------------
 
-.. function:: void obs_output_addref(obs_output_t *output)
-
-   Adds a reference to an output.
-
-.. deprecated:: 27.2.0
-   Use :c:func:`obs_output_get_ref()` instead.
-
----------------------
-
 .. function:: obs_output_t *obs_output_get_ref(obs_output_t *output)
 
    Returns an incremented reference if still valid, otherwise returns

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

@@ -197,15 +197,6 @@ General Scene Functions
 
 ---------------------
 
-.. function:: void obs_scene_addref(obs_scene_t *scene)
-
-   Adds a reference to a scene.
-
-.. deprecated:: 27.2.0
-   Use :c:func:`obs_scene_get_ref()` instead.
-
----------------------
-
 .. function:: obs_scene_t *obs_scene_get_ref(obs_scene_t *scene)
 
    Returns an incremented reference if still valid, otherwise returns

+ 0 - 9
docs/sphinx/reference-services.rst

@@ -241,15 +241,6 @@ General Service Functions
 
 ---------------------
 
-.. function:: void obs_service_addref(obs_service_t *service)
-
-   Adds a reference to a service.
-
-.. deprecated:: 27.2.0
-   Use :c:func:`obs_service_get_ref()` instead.
-
----------------------
-
 .. function:: obs_service_t *obs_service_get_ref(obs_service_t *service)
 
    Returns an incremented reference if still valid, otherwise returns

+ 0 - 9
docs/sphinx/reference-sources.rst

@@ -915,15 +915,6 @@ General Source Functions
 
 ---------------------
 
-.. function:: void obs_source_addref(obs_source_t *source)
-
-   Adds a reference to a source.
-
-.. deprecated:: 27.2.0
-   Use :c:func:`obs_source_get_ref()` instead.
-
----------------------
-
 .. function:: obs_source_t *obs_source_get_ref(obs_source_t *source)
 
    Returns an incremented reference if still valid, otherwise returns

+ 0 - 8
libobs/obs-encoder.c

@@ -1814,14 +1814,6 @@ obs_encoder_get_preferred_video_format(const obs_encoder_t *encoder)
 	return encoder->preferred_format;
 }
 
-void obs_encoder_addref(obs_encoder_t *encoder)
-{
-	if (!encoder)
-		return;
-
-	obs_ref_addref(&encoder->context.control->ref);
-}
-
 void obs_encoder_release(obs_encoder_t *encoder)
 {
 	if (!encoder)

+ 1 - 0
libobs/obs-internal.h

@@ -932,6 +932,7 @@ obs_source_create_set_last_ver(const char *id, const char *name,
 			       obs_data_t *hotkey_data, uint32_t last_obs_ver,
 			       bool is_private);
 extern void obs_source_destroy(struct obs_source *source);
+extern void obs_source_addref(obs_source_t *source);
 
 enum view_type {
 	MAIN_VIEW,

+ 0 - 8
libobs/obs-output.c

@@ -3022,14 +3022,6 @@ void obs_output_signal_stop(obs_output_t *output, int code)
 	}
 }
 
-void obs_output_addref(obs_output_t *output)
-{
-	if (!output)
-		return;
-
-	obs_ref_addref(&output->context.control->ref);
-}
-
 void obs_output_release(obs_output_t *output)
 {
 	if (!output)

+ 1 - 1
libobs/obs-scene.c

@@ -2197,7 +2197,7 @@ obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name,
 	return new_scene;
 }
 
-void obs_scene_addref(obs_scene_t *scene)
+static inline void obs_scene_addref(obs_scene_t *scene)
 {
 	if (scene)
 		obs_source_addref(scene->source);

+ 0 - 8
libobs/obs-service.c

@@ -322,14 +322,6 @@ void obs_service_apply_encoder_settings(obs_service_t *service,
 						     audio_encoder_settings);
 }
 
-void obs_service_addref(obs_service_t *service)
-{
-	if (!service)
-		return;
-
-	obs_ref_addref(&service->context.control->ref);
-}
-
 void obs_service_release(obs_service_t *service)
 {
 	if (!service)

+ 0 - 5
libobs/obs.h

@@ -1030,7 +1030,6 @@ EXPORT obs_source_t *obs_source_duplicate(obs_source_t *source,
  * Adds/releases a reference to a source.  When the last reference is
  * released, the source is destroyed.
  */
-OBS_EXTERNAL_DEPRECATED EXPORT void obs_source_addref(obs_source_t *source);
 EXPORT void obs_source_release(obs_source_t *source);
 
 EXPORT void obs_weak_source_addref(obs_weak_source_t *weak);
@@ -1735,7 +1734,6 @@ enum obs_scene_duplicate_type {
 EXPORT obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name,
 					enum obs_scene_duplicate_type type);
 
-OBS_EXTERNAL_DEPRECATED EXPORT void obs_scene_addref(obs_scene_t *scene);
 EXPORT void obs_scene_release(obs_scene_t *scene);
 
 EXPORT obs_scene_t *obs_scene_get_ref(obs_scene_t *scene);
@@ -2053,7 +2051,6 @@ EXPORT obs_output_t *obs_output_create(const char *id, const char *name,
  * Adds/releases a reference to an output.  When the last reference is
  * released, the output is destroyed.
  */
-OBS_EXTERNAL_DEPRECATED EXPORT void obs_output_addref(obs_output_t *output);
 EXPORT void obs_output_release(obs_output_t *output);
 
 EXPORT void obs_weak_output_addref(obs_weak_output_t *weak);
@@ -2410,7 +2407,6 @@ EXPORT obs_encoder_t *obs_audio_encoder_create(const char *id, const char *name,
  * Adds/releases a reference to an encoder.  When the last reference is
  * released, the encoder is destroyed.
  */
-OBS_EXTERNAL_DEPRECATED EXPORT void obs_encoder_addref(obs_encoder_t *encoder);
 EXPORT void obs_encoder_release(obs_encoder_t *encoder);
 
 EXPORT void obs_weak_encoder_addref(obs_weak_encoder_t *weak);
@@ -2628,7 +2624,6 @@ EXPORT obs_service_t *obs_service_create_private(const char *id,
  * Adds/releases a reference to a service.  When the last reference is
  * released, the service is destroyed.
  */
-OBS_EXTERNAL_DEPRECATED EXPORT void obs_service_addref(obs_service_t *service);
 EXPORT void obs_service_release(obs_service_t *service);
 
 EXPORT void obs_weak_service_addref(obs_weak_service_t *weak);