[vlc-commits] libvlc: remove audio stub functions

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu May  3 15:15:36 2018 +0300| [9a4e671d3864d1932383dc712130d1db0deaba31] | committer: Rémi Denis-Courmont

libvlc: remove audio stub functions

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9a4e671d3864d1932383dc712130d1db0deaba31
---

 include/vlc/deprecated.h | 46 ----------------------------------------------
 lib/audio.c              | 35 -----------------------------------
 lib/libvlc.sym           |  5 -----
 3 files changed, 86 deletions(-)

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index c214949e44..445acae012 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -60,52 +60,6 @@ void libvlc_track_description_release( libvlc_track_description_t *p_track_descr
 /** @}*/
 
 /**
- * \ingroup libvlc libvlc_audio
- * @{
- */
-
-/**
- * Backward compatibility stub. Do not use in new code.
- * \deprecated Use libvlc_audio_output_device_list_get() instead.
- * \return always 0.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-int libvlc_audio_output_device_count( libvlc_instance_t *p_instance, const char *psz_audio_output );
-
-/**
- * Backward compatibility stub. Do not use in new code.
- * \deprecated Use libvlc_audio_output_device_list_get() instead.
- * \return always NULL.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-char *libvlc_audio_output_device_longname( libvlc_instance_t *p_instance, const char *psz_output,
-                                           int i_device );
-
-/**
- * Backward compatibility stub. Do not use in new code.
- * \deprecated Use libvlc_audio_output_device_list_get() instead.
- * \return always NULL.
- */
-LIBVLC_DEPRECATED LIBVLC_API
-char *libvlc_audio_output_device_id( libvlc_instance_t *p_instance, const char *psz_audio_output, int i_device );
-
-/**
- * Stub for backward compatibility.
- * \return always -1.
- */
-LIBVLC_DEPRECATED
-LIBVLC_API int libvlc_audio_output_get_device_type( libvlc_media_player_t *p_mi );
-
-/**
- * Stub for backward compatibility.
- */
-LIBVLC_DEPRECATED
-LIBVLC_API void libvlc_audio_output_set_device_type( libvlc_media_player_t *p_mp,
-                                                     int device_type );
-
-/** @}*/
-
-/**
  * \ingroup libvlc libvlc_media
  * @{
  */
diff --git a/lib/audio.c b/lib/audio.c
index 5fe2ce202c..0c4285b1de 100644
--- a/lib/audio.c
+++ b/lib/audio.c
@@ -227,29 +227,6 @@ void libvlc_audio_output_device_list_release( libvlc_audio_output_device_t *l )
     }
 }
 
-int libvlc_audio_output_device_count( libvlc_instance_t *p_instance,
-                                      const char *psz_audio_output )
-{
-    (void) p_instance; (void) psz_audio_output;
-    return 0;
-}
-
-char *libvlc_audio_output_device_longname( libvlc_instance_t *p_instance,
-                                           const char *psz_audio_output,
-                                           int i_device )
-{
-    (void) p_instance; (void) psz_audio_output; (void) i_device;
-    return NULL;
-}
-
-char *libvlc_audio_output_device_id( libvlc_instance_t *p_instance,
-                                     const char *psz_audio_output,
-                                     int i_device )
-{
-    (void) p_instance; (void) psz_audio_output; (void) i_device;
-    return NULL;
-}
-
 /*****************************
  * Set device for using
  *****************************/
@@ -295,18 +272,6 @@ char *libvlc_audio_output_device_get( libvlc_media_player_t *mp )
     return devid;
 }
 
-int libvlc_audio_output_get_device_type( libvlc_media_player_t *mp )
-{
-    (void) mp;
-    return libvlc_AudioOutputDevice_Error;
-}
-
-void libvlc_audio_output_set_device_type( libvlc_media_player_t *mp,
-                                          int device_type )
-{
-    (void) mp; (void) device_type;
-}
-
 void libvlc_audio_toggle_mute( libvlc_media_player_t *mp )
 {
     int mute = libvlc_audio_get_mute( mp );
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 7971ac4041..a18f508d74 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -14,19 +14,14 @@ libvlc_audio_equalizer_new_from_preset
 libvlc_audio_equalizer_release
 libvlc_audio_equalizer_set_amp_at_index
 libvlc_audio_equalizer_set_preamp
-libvlc_audio_output_device_count
 libvlc_audio_output_device_get
 libvlc_audio_output_device_enum
-libvlc_audio_output_device_id
 libvlc_audio_output_device_list_get
 libvlc_audio_output_device_list_release
-libvlc_audio_output_device_longname
 libvlc_audio_output_device_set
-libvlc_audio_output_get_device_type
 libvlc_audio_output_list_get
 libvlc_audio_output_list_release
 libvlc_audio_output_set
-libvlc_audio_output_set_device_type
 libvlc_audio_get_channel
 libvlc_audio_get_delay
 libvlc_audio_get_mute