Remove useless parameter

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index 1dd857be1b333b4fb144b050abd54fce23405f34..d647b61543c515f125304d7ef3a57a20187d90e2 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -56,9 +56,7 @@ struct services_discovery_t
 
 /* Get the services discovery modules names to use in Create(), in a null
  * terminated string array. Array and string must be freed after use. */
-VLC_EXPORT( char **, __services_discovery_GetServicesNames, ( vlc_object_t * p_super, char ***pppsz_longnames ) );
-#define services_discovery_GetServicesNames(a,b) \
-        __services_discovery_GetServicesNames(VLC_OBJECT(a),b)
+VLC_EXPORT( char **, vlc_sd_GetNames, ( char ***pppsz_longnames ) );
 
 /* Creation of a service_discovery object */
 VLC_EXPORT( services_discovery_t *, vlc_sd_Create, ( vlc_object_t * ) );

diff --git a/modules/gui/macosx/playlist.m b/modules/gui/macosx/playlist.m
index 54951e0dc9581ed50e1d72c0d9db1bc20f94ddf8..aa49b2fbe36af55743bc69894a244c3e2db5dc96 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -386,7 +386,7 @@
     o_tc_sortColumn = nil;
 
     char ** ppsz_name;
-    char ** ppsz_services = services_discovery_GetServicesNames( p_playlist, &ppsz_name );
+    char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
     if( !ppsz_services )
     {
         vlc_object_release( p_playlist );

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 32fda56655a902a54978fe8b037a0aeb7adbc934..3f8f5f6d388cc2db8a1010204aa6f047b1b1ffa4 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -609,8 +609,7 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf )
     QMenu *menu = new QMenu();
     menu->setTitle( qtr( I_PL_SD ) );
     char **ppsz_longnames;
-    char **ppsz_names = services_discovery_GetServicesNames( p_intf,
-                                                             &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
     if( !ppsz_names )
         return menu;
 

diff --git a/modules/gui/wxwidgets/dialogs/playlist.cpp b/modules/gui/wxwidgets/dialogs/playlist.cpp
index d819a1924b9c77cb303d9ae8546350493f7e6f7d..ea64de56c74d224a6bf561a3b328707373c440bf 100644 (file)
--- a/modules/gui/wxwidgets/dialogs/playlist.cpp
+++ b/modules/gui/wxwidgets/dialogs/playlist.cpp
@@ -1407,8 +1407,7 @@ wxMenu *Playlist::SDMenu()
     p_sd_menu = new wxMenu;
 
     char **ppsz_longnames;
-    char **ppsz_names = services_discovery_GetServicesNames( p_playlist,
-                                                             &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
     if( !ppsz_names )
         return p_sd_menu;
 

diff --git a/modules/misc/lua/libs/sd.c b/modules/misc/lua/libs/sd.c
index ca855599adf16646a8e4044ac355d2fecd2626f7..0b5e88b3ace6b07d4f35e3eef68e5b1872e4a8ab 100644 (file)
--- a/modules/misc/lua/libs/sd.c
+++ b/modules/misc/lua/libs/sd.c
@@ -51,7 +51,7 @@ static int vlclua_sd_get_services_names( lua_State *L )
 {
     vlc_object_t *p_this = vlclua_get_this( L );
     char **ppsz_longnames;
-    char **ppsz_names = services_discovery_GetServicesNames( p_this, &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
     if( !ppsz_names )
         return 0;
 

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 8522d4b8523192702a18f52c2e7c3d6ce93a01e5..3658d2db92a579082888189cf8f61c5b9910b336 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -319,7 +319,6 @@ secstotimestr
 services_discovery_AddItem
 services_discovery_EventManager
 services_discovery_GetLocalizedName
-__services_discovery_GetServicesNames
 services_discovery_RemoveItem
 sout_AccessOutControl
 sout_AccessOutDelete
@@ -494,6 +493,7 @@ vlc_rand_bytes
 vlc_recvmsg
 vlc_release
 vlc_sd_Create
+vlc_sd_GetNames
 vlc_sdp_Start
 vlc_sd_Start
 vlc_sd_Stop

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 644a2acd3c6e77642cec8e46a0e51d0a1e56a1c8..cdbbeb22cbad1c0b233361c5327cd86ed4db5f95 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -40,11 +40,10 @@
  * That's how the playlist get's Service Discovery information
  */
 
-/***********************************************************************
- * GetServicesNames
- ***********************************************************************/
-char ** __services_discovery_GetServicesNames( vlc_object_t * p_super,
-                                               char ***pppsz_longnames )
+/**
+ * Gets the list of available services discovery plugins.
+ */
+char **vlc_sd_GetNames( char ***pppsz_longnames )
 {
     return module_GetModulesNamesForCapability( "services_discovery",
                                                 pppsz_longnames );