[vlc-commits] sd: remove services_discovery_GetLocalizedName()

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Nov 15 19:44:43 2016 +0200| [747a44649fa7f090dea74892a11151503d6cb3f1] | committer: Rémi Denis-Courmont

sd: remove services_discovery_GetLocalizedName()

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

 include/vlc_services_discovery.h  |  3 ---
 lib/media_discoverer.c            |  4 +++-
 src/libvlccore.sym                |  1 -
 src/playlist/services_discovery.c | 13 -------------
 4 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index d581cfc..938fcb1 100644
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -147,9 +147,6 @@ VLC_USED;
 
 VLC_API void vlc_sd_Destroy( services_discovery_t * );
 
-/* Read info from discovery object */
-VLC_API char * services_discovery_GetLocalizedName( services_discovery_t * p_this ) VLC_USED;
-
 /**
  * Added service callback.
  *
diff --git a/lib/media_discoverer.c b/lib/media_discoverer.c
index 9d4ded5..af12a5e 100644
--- a/lib/media_discoverer.c
+++ b/lib/media_discoverer.c
@@ -274,7 +274,9 @@ libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
 char *
 libvlc_media_discoverer_localized_name( libvlc_media_discoverer_t * p_mdis )
 {
-    return services_discovery_GetLocalizedName( p_mdis->p_sd );
+    if( p_mdis->p_sd == NULL || p_mdis->p_sd->description == NULL )
+        return NULL;
+    return strdup( p_mdis->p_sd->description );
 }
 
 /**************************************************************************
diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 5d45cdd..eeed931 100644
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -375,7 +375,6 @@ playlist_MuteGet
 sdp_AddAttribute
 sdp_AddMedia
 secstotimestr
-services_discovery_GetLocalizedName
 sout_AccessOutControl
 sout_AccessOutDelete
 sout_AccessOutNew
diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 4867158..8946eea 100644
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -138,19 +138,6 @@ void vlc_sd_Destroy(services_discovery_t *sd)
     vlc_object_release(sd);
 }
 
-/*******************************************************************//**
- * Get the Localized Name
- *
- * This is useful for interfaces and libVLC
- ***********************************************************************/
-char *
-services_discovery_GetLocalizedName ( services_discovery_t * p_sd )
-{
-    if (p_sd->p_module == NULL)
-        return NULL;
-    return strdup( module_get_name( p_sd->p_module, true ) );
-}
-
 /*
  * Playlist - Services discovery bridge
  */