Browse Source

docs,libobs: Remove deprecated service APIs

Deprecated in 29.1
derrod 1 year ago
parent
commit
22fc29c5b4
3 changed files with 0 additions and 103 deletions
  1. 0 36
      docs/sphinx/reference-services.rst
  2. 0 46
      libobs/obs-service.c
  3. 0 21
      libobs/obs.h

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

@@ -310,42 +310,6 @@ General Service Functions
 
 ---------------------
 
-.. function:: const char *obs_service_get_url(const obs_service_t *service)
-
-  :return: The URL currently used for this service
-
-.. deprecated:: 29.1.0
-   Use :c:func:`obs_service_get_connect_info()` instead.
-
----------------------
-
-.. function:: const char *obs_service_get_key(const obs_service_t *service)
-
-  :return: Stream key (if any) currently used for this service
-
-.. deprecated:: 29.1.0
-   Use :c:func:`obs_service_get_connect_info()` instead.
-
----------------------
-
-.. function:: const char *obs_service_get_username(const obs_service_t *service)
-
-   :return: User name (if any) currently used for this service
-
-.. deprecated:: 29.1.0
-   Use :c:func:`obs_service_get_connect_info()` instead.
-
----------------------
-
-.. function:: const char *obs_service_get_password(const obs_service_t *service)
-
-   :return: Password (if any) currently used for this service
-
-.. deprecated:: 29.1.0
-   Use :c:func:`obs_service_get_connect_info()` instead.
-
----------------------
-
 .. function:: void obs_service_apply_encoder_settings(obs_service_t *service, obs_data_t *video_encoder_settings, obs_data_t *audio_encoder_settings)
 
    Applies service-specific video encoder settings.

+ 0 - 46
libobs/obs-service.c

@@ -209,46 +209,6 @@ proc_handler_t *obs_service_get_proc_handler(const obs_service_t *service)
 		       : NULL;
 }
 
-const char *obs_service_get_url(const obs_service_t *service)
-{
-	if (!obs_service_valid(service, "obs_service_get_url"))
-		return NULL;
-
-	if (!service->info.get_url)
-		return NULL;
-	return service->info.get_url(service->context.data);
-}
-
-const char *obs_service_get_key(const obs_service_t *service)
-{
-	if (!obs_service_valid(service, "obs_service_get_key"))
-		return NULL;
-
-	if (!service->info.get_key)
-		return NULL;
-	return service->info.get_key(service->context.data);
-}
-
-const char *obs_service_get_username(const obs_service_t *service)
-{
-	if (!obs_service_valid(service, "obs_service_get_username"))
-		return NULL;
-
-	if (!service->info.get_username)
-		return NULL;
-	return service->info.get_username(service->context.data);
-}
-
-const char *obs_service_get_password(const obs_service_t *service)
-{
-	if (!obs_service_valid(service, "obs_service_get_password"))
-		return NULL;
-
-	if (!service->info.get_password)
-		return NULL;
-	return service->info.get_password(service->context.data);
-}
-
 void obs_service_activate(struct obs_service *service)
 {
 	if (!obs_service_valid(service, "obs_service_activate"))
@@ -477,12 +437,6 @@ const char *obs_service_get_protocol(const obs_service_t *service)
 	return service->info.get_protocol(service->context.data);
 }
 
-/* OBS_DEPRECATED */
-const char *obs_service_get_output_type(const obs_service_t *service)
-{
-	return obs_service_get_preferred_output_type(service);
-}
-
 const char *obs_service_get_preferred_output_type(const obs_service_t *service)
 {
 	if (!obs_service_valid(service,

+ 0 - 21
libobs/obs.h

@@ -2634,22 +2634,6 @@ EXPORT void obs_service_update(obs_service_t *service, obs_data_t *settings);
 /** Returns the current settings for this service */
 EXPORT obs_data_t *obs_service_get_settings(const obs_service_t *service);
 
-/** Returns the URL for this service context */
-OBS_DEPRECATED EXPORT const char *
-obs_service_get_url(const obs_service_t *service);
-
-/** Returns the stream key (if any) for this service context */
-OBS_DEPRECATED EXPORT const char *
-obs_service_get_key(const obs_service_t *service);
-
-/** Returns the username (if any) for this service context */
-OBS_DEPRECATED EXPORT const char *
-obs_service_get_username(const obs_service_t *service);
-
-/** Returns the password (if any) for this service context */
-OBS_DEPRECATED EXPORT const char *
-obs_service_get_password(const obs_service_t *service);
-
 /**
  * Applies service-specific video encoder settings.
  *
@@ -2679,11 +2663,6 @@ obs_service_get_supported_video_codecs(const obs_service_t *service);
 EXPORT const char **
 obs_service_get_supported_audio_codecs(const obs_service_t *service);
 
-/* NOTE: This function is temporary and should be removed/replaced at a later
- * date. */
-OBS_DEPRECATED EXPORT const char *
-obs_service_get_output_type(const obs_service_t *service);
-
 /** Returns the protocol for this service context */
 EXPORT const char *obs_service_get_protocol(const obs_service_t *service);