[vlc-commits] libvlc: remove deprecated SD functions

[Rémi Denis-Courmont]

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

libvlc: remove deprecated SD functions

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

 include/vlc/deprecated.h | 26 --------------------------
 lib/libvlc.sym           |  2 --
 lib/media_discoverer.c   | 34 ----------------------------------
 3 files changed, 62 deletions(-)

diff --git a/include/vlc/deprecated.h b/include/vlc/deprecated.h
index a7d0ad96bb..735f98151e 100644
--- a/include/vlc/deprecated.h
+++ b/include/vlc/deprecated.h
@@ -155,32 +155,6 @@ LIBVLC_DEPRECATED int
 /** @}*/
 
 /**
- * \ingroup libvlc libvlc_media_discoverer
- * @{
- */
-
-/**
- * \deprecated Use libvlc_media_discoverer_new() and libvlc_media_discoverer_start().
- */
-LIBVLC_DEPRECATED LIBVLC_API libvlc_media_discoverer_t *
-libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
-                                       const char * psz_name );
-
-/**
- * Get media service discover object its localized name.
- *
- * \deprecated Useless, use libvlc_media_discoverer_list_get() to get the
- * longname of the service discovery.
- *
- * \param p_mdis media discover object
- * \return localized name or NULL if the media_discoverer is not started
- */
-LIBVLC_DEPRECATED LIBVLC_API char *
-libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis );
-
-/** @}*/
-
-/**
  * \ingroup libvlc libvlc_core
  * @{
  */
diff --git a/lib/libvlc.sym b/lib/libvlc.sym
index 5ae867a693..c7f64d9b2f 100644
--- a/lib/libvlc.sym
+++ b/lib/libvlc.sym
@@ -64,10 +64,8 @@ libvlc_log_unset
 libvlc_media_add_option
 libvlc_media_add_option_flag
 libvlc_media_discoverer_is_running
-libvlc_media_discoverer_localized_name
 libvlc_media_discoverer_media_list
 libvlc_media_discoverer_new
-libvlc_media_discoverer_new_from_name
 libvlc_media_discoverer_release
 libvlc_media_discoverer_list_get
 libvlc_media_discoverer_list_release
diff --git a/lib/media_discoverer.c b/lib/media_discoverer.c
index b2d5b9d5a1..b0004ffb1f 100644
--- a/lib/media_discoverer.c
+++ b/lib/media_discoverer.c
@@ -209,29 +209,6 @@ libvlc_media_discoverer_stop( libvlc_media_discoverer_t * p_mdis )
 }
 
 /**************************************************************************
- *       new_from_name (Public)
- *
- * \deprecated Use libvlc_media_discoverer_new and libvlc_media_discoverer_start
- **************************************************************************/
-libvlc_media_discoverer_t *
-libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
-                                       const char * psz_name )
-{
-    libvlc_media_discoverer_t *p_mdis = libvlc_media_discoverer_new( p_inst, psz_name );
-
-    if( !p_mdis )
-        return NULL;
-
-    if( libvlc_media_discoverer_start( p_mdis ) != 0)
-    {
-        libvlc_media_discoverer_release( p_mdis );
-        return NULL;
-    }
-
-    return p_mdis;
-}
-
-/**************************************************************************
  * release (Public)
  **************************************************************************/
 static void
@@ -258,17 +235,6 @@ libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
 }
 
 /**************************************************************************
- * localized_name (Public)
- **************************************************************************/
-char *
-libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis )
-{
-    if( p_mdis->p_sd == NULL || p_mdis->p_sd->description == NULL )
-        return NULL;
-    return strdup( p_mdis->p_sd->description );
-}
-
-/**************************************************************************
  * media_list (Public)
  **************************************************************************/
 libvlc_media_list_t *