Export services_discovery_RemoveAll

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>

diff --git a/include/vlc_events.h b/include/vlc_events.h
index 92193cccba54f7674d3f6e1abeca2f1c856ac158..9e37f7f5753243d52a4fba2616d958598083a53f 100644 (file)
--- a/include/vlc_events.h
+++ b/include/vlc_events.h
@@ -127,6 +127,7 @@ typedef enum vlc_event_type_t {
     /* Service Discovery event */
     vlc_ServicesDiscoveryItemAdded,
     vlc_ServicesDiscoveryItemRemoved,
+    vlc_ServicesDiscoveryItemRemoveAll,
     vlc_ServicesDiscoveryStarted,
     vlc_ServicesDiscoveryEnded
 } vlc_event_type_t;

diff --git a/include/vlc_services_discovery.h b/include/vlc_services_discovery.h
index 22df2fc8fd77c2036763a6202c784006dd6c44d7..d9c231b28f3ec075343e0f8016792b8fa33f60f5 100644 (file)
--- a/include/vlc_services_discovery.h
+++ b/include/vlc_services_discovery.h
@@ -157,6 +157,7 @@ VLC_API vlc_event_manager_t * services_discovery_EventManager( services_discover
      * for more options, directly set the (meta) data on the input item */
 VLC_API void services_discovery_AddItem( services_discovery_t * p_this, input_item_t * p_item, const char * psz_category );
 VLC_API void services_discovery_RemoveItem( services_discovery_t * p_this, input_item_t * p_item );
+VLC_API void services_discovery_RemoveAll( services_discovery_t * p_sd );
 
 
 /* SD probing */

diff --git a/lib/media_discoverer.c b/lib/media_discoverer.c
index fcfb4b738f8f9a230501047608442a49614ba0f7..6fcefc523f233b313588001abc2dbc474b07ccf7 100644 (file)
--- a/lib/media_discoverer.c
+++ b/lib/media_discoverer.c
@@ -128,6 +128,22 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
     libvlc_media_list_unlock( p_mdis->p_mlist );
 }
 
+/**************************************************************************
+ *       services_discovery_removeall (Private) (VLC event callback)
+ **************************************************************************/
+static void services_discovery_removeall( const vlc_event_t * p_event,
+                                             void * user_data )
+{
+    libvlc_media_discoverer_t * p_mdis = user_data;
+
+    libvlc_media_list_lock( p_mdis->p_mlist );
+    for( int i = 0; i < libvlc_media_list_count( p_mdis->p_mlist ); i++ )
+    {
+        _libvlc_media_list_remove_index( p_mdis->p_mlist, i );
+    }
+    libvlc_media_list_unlock( p_mdis->p_mlist );
+}
+
 /**************************************************************************
  *       services_discovery_started (Private) (VLC event callback)
  **************************************************************************/
@@ -226,6 +242,10 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
                       vlc_ServicesDiscoveryEnded,
                       services_discovery_ended,
                       p_mdis );
+    vlc_event_attach( services_discovery_EventManager( p_mdis->p_sd ),
+                      vlc_ServicesDiscoveryItemRemoveAll,
+                      services_discovery_removeall,
+                      p_mdis );
 
     /* Here we go */
     if( !vlc_sd_Start( p_mdis->p_sd ) )
@@ -265,6 +285,10 @@ libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
                      vlc_ServicesDiscoveryEnded,
                      services_discovery_ended,
                      p_mdis );
+    vlc_event_detach( services_discovery_EventManager( p_mdis->p_sd ),
+                     vlc_ServicesDiscoveryItemRemoveAll,
+                     services_discovery_removeall,
+                     p_mdis );
 
     libvlc_media_list_release( p_mdis->p_mlist );
 

diff --git a/src/libvlccore.sym b/src/libvlccore.sym
index 5092d30f142fecfa4c5af6f2ab11b17340788e13..7dfbbcd54aadff644858414241571b7d2cf10694 100644 (file)
--- a/src/libvlccore.sym
+++ b/src/libvlccore.sym
@@ -381,6 +381,7 @@ secstotimestr
 services_discovery_AddItem
 services_discovery_EventManager
 services_discovery_GetLocalizedName
+services_discovery_RemoveAll
 services_discovery_RemoveItem
 sout_AccessOutControl
 sout_AccessOutDelete

diff --git a/src/playlist/services_discovery.c b/src/playlist/services_discovery.c
index d8b93d6f12209a043d1d1fd673c94885698d0198..a0a3e136e4420759bd8916ecbc258d3b04b07b7f 100644 (file)
--- a/src/playlist/services_discovery.c
+++ b/src/playlist/services_discovery.c
@@ -120,6 +120,7 @@ services_discovery_t *vlc_sd_Create( vlc_object_t *p_super,
     vlc_event_manager_init( em, p_sd );
     vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryItemAdded);
     vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryItemRemoved);
+    vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryItemRemoveAll);
     vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryStarted);
     vlc_event_manager_register_event_type(em, vlc_ServicesDiscoveryEnded);
 
@@ -207,6 +208,18 @@ services_discovery_EventManager ( services_discovery_t * p_sd )
     return &p_sd->event_manager;
 }
 
+/*******************************************************************//**
+ * Remove all items from the Service Discovery listing
+ ***********************************************************************/
+void
+services_discovery_RemoveAll ( services_discovery_t * p_sd )
+{
+    vlc_event_t event;
+    event.type = vlc_ServicesDiscoveryItemRemoveAll;
+
+    vlc_event_send( &p_sd->event_manager, &event );
+}
+
 /*******************************************************************//**
  * Add an item to the Service Discovery listing
  ***********************************************************************/
@@ -306,6 +319,17 @@ static void playlist_sd_item_removed( const vlc_event_t * p_event, void * user_d
     PL_UNLOCK;
 }
 
+/* A request to remove all ideas from SD */
+static void playlist_sd_item_removeall( const vlc_event_t * p_event, void * user_data )
+{
+    playlist_item_t* p_sd_node = user_data;
+    if( p_sd_node == NULL ) return;
+    playlist_t* p_playlist = p_sd_node->p_playlist;
+    PL_LOCK;
+    playlist_NodeEmpty( p_playlist, p_sd_node, true );
+    PL_UNLOCK;
+}
+
 int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
                                    const char *psz_name )
 {
@@ -355,6 +379,9 @@ int playlist_ServicesDiscoveryAdd( playlist_t *p_playlist,
     vlc_event_attach( em, vlc_ServicesDiscoveryItemRemoved,
                       playlist_sd_item_removed, p_node );
 
+    vlc_event_attach( em, vlc_ServicesDiscoveryItemRemoveAll,
+                      playlist_sd_item_removeall, p_node );
+
     if( !vlc_sd_Start( p_sd ) )
     {
         vlc_sd_Destroy( p_sd );