vlc_sd_GetNames: add object parameter

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index d647b61543c515f125304d7ef3a57a20187d90e2..f6eaa0e77a11f49c57c2ac3e1a0d34e0c40fbf01 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -56,7 +56,9 @@ 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 **, vlc_sd_GetNames, ( char ***pppsz_longnames ) );
+VLC_EXPORT( char **, vlc_sd_GetNames, ( vlc_object_t *, char *** ) );
+#define vlc_sd_GetNames(obj, pln) \
+        vlc_sd_GetNames(VLC_OBJECT(obj), pln)
 
 /* 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 f3d62dd56f08d5f68b3038c120c05094c0666569..031accd018ff7df38e2b3f12501c39030b1c8023 100644 (file)
--- a/modules/gui/macosx/playlist.m
+++ b/modules/gui/macosx/playlist.m
@@ -419,7 +419,7 @@
     o_tc_sortColumn = nil;
 
     char ** ppsz_name;
-    char ** ppsz_services = vlc_sd_GetNames( &ppsz_name );
+    char ** ppsz_services = vlc_sd_GetNames( VLCIntf, &ppsz_name );
     if( !ppsz_services )
     {
         pl_Release( VLCIntf );

diff --git a/modules/gui/qt4/components/playlist/selector.cpp b/modules/gui/qt4/components/playlist/selector.cpp
index 17de1f2fa70d678102f498820370562249a8016b..61f6ab74b973874b0e3cafcf7798223d3659e94d 100644 (file)
--- a/modules/gui/qt4/components/playlist/selector.cpp
+++ b/modules/gui/qt4/components/playlist/selector.cpp
@@ -255,7 +255,7 @@ void PLSelector::createItems()
     msrc->setExpanded( true );
 
     char **ppsz_longnames;
-    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( THEPL, &ppsz_longnames );
     if( !ppsz_names )
         return;
 

diff --git a/modules/gui/qt4/menus.cpp b/modules/gui/qt4/menus.cpp
index 5bb55b4b70b2f0e75ffeb78aceaeb271d05aa667..cc43536a4b0914d23fe5a8df4c84de2ac5e02521 100644 (file)
--- a/modules/gui/qt4/menus.cpp
+++ b/modules/gui/qt4/menus.cpp
@@ -660,7 +660,7 @@ QMenu *QVLCMenu::SDMenu( intf_thread_t *p_intf, QWidget *parent )
     menu->setTitle( qtr( I_PL_SD ) );
 
     char **ppsz_longnames;
-    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( p_intf, &ppsz_longnames );
     if( !ppsz_names )
         return menu;
 

diff --git a/modules/misc/lua/libs/sd.c b/modules/misc/lua/libs/sd.c
index 491b682ae4b977e862869fc3834206dd1df58ab8..de161e40a9b5a13f7745931f5aa29855e82ec907 100644 (file)
--- a/modules/misc/lua/libs/sd.c
+++ b/modules/misc/lua/libs/sd.c
@@ -49,8 +49,10 @@
  *****************************************************************************/
 static int vlclua_sd_get_services_names( lua_State *L )
 {
+    playlist_t *p_playlist = vlclua_get_playlist_internal( L );
     char **ppsz_longnames;
-    char **ppsz_names = vlc_sd_GetNames( &ppsz_longnames );
+    char **ppsz_names = vlc_sd_GetNames( p_playlist, &ppsz_longnames );
+    vlclua_release_playlist_internal( p_playlist );
     if( !ppsz_names )
         return 0;
 

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index 1aa8f64e685ca8dea83bc60b46c6ad57bef16f8a..53a314be44e19788e4df8cf103835233933a6798 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -50,10 +50,12 @@ static void services_discovery_Destructor ( vlc_object_t *p_obj );
  * That's how the playlist get's Service Discovery information
  */
 
+#undef vlc_sd_GetNames
+
 /**
  * Gets the list of available services discovery plugins.
  */
-char **vlc_sd_GetNames( char ***pppsz_longnames )
+char **vlc_sd_GetNames( vlc_object_t *obj, char ***pppsz_longnames )
 {
     return module_GetModulesNamesForCapability( "services_discovery",
                                                 pppsz_longnames );