services_discovery: Partially fix service discovery. We yet need to find a way to...

[vlc] / src / control / media_discoverer.c

diff --git a/src/control/media_discoverer.c b/src/control/media_discoverer.c
index cb2b158405ed89c08a2fcbd7643300eaa4c3166e..c1b811b0383c54b2aee07751ffc6d308f4f411f0 100644 (file)
--- a/src/control/media_discoverer.c
+++ b/src/control/media_discoverer.c
@@ -38,16 +38,47 @@ static void services_discovery_item_added( const vlc_event_t * p_event,
                                            void * user_data )
 {
     input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
-    libvlc_media_descriptor_t * p_md;
+    const char * psz_cat = p_event->u.services_discovery_item_added.psz_category;
+    libvlc_media_t * p_md;
     libvlc_media_discoverer_t * p_mdis = user_data;
+    libvlc_media_list_t * p_mlist = p_mdis->p_mlist;
 
-    p_md = libvlc_media_descriptor_new_from_input_item(
+    p_md = libvlc_media_new_from_input_item(
             p_mdis->p_libvlc_instance,
             p_item, NULL );
 
-    libvlc_media_list_lock( p_mdis->p_mlist );
-    libvlc_media_list_add_media_descriptor( p_mdis->p_mlist, p_md, NULL );
-    libvlc_media_list_unlock( p_mdis->p_mlist );
+    /* If we have a category, that mean we have to group the items having
+     * that category in a media_list. */
+    if( psz_cat )
+    {
+        p_mlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, psz_cat );
+
+        if( p_mlist == kVLCDictionaryNotFound )
+        {
+            libvlc_media_t * p_catmd;
+            p_catmd = libvlc_media_new_as_node( p_mdis->p_libvlc_instance, psz_cat, NULL );
+            p_mlist = libvlc_media_subitems( p_catmd, NULL );
+            p_mlist->b_read_only = true;
+
+            /* Insert the newly created mlist in our dictionary */
+            vlc_dictionary_insert( &p_mdis->catname_to_submedialist, psz_cat, p_mlist );
+
+            /* Insert the md into the root list */
+            libvlc_media_list_lock( p_mdis->p_mlist );
+            _libvlc_media_list_add_media( p_mdis->p_mlist, p_catmd, NULL );
+            libvlc_media_list_unlock( p_mdis->p_mlist );
+
+            /* We don't release the mlist cause the dictionary
+             * doesn't retain the object. But we release the md. */
+            libvlc_media_release( p_catmd );
+        }
+    }
+    else
+    {
+        libvlc_media_list_lock( p_mlist );
+        _libvlc_media_list_add_media( p_mlist, p_md, NULL );
+        libvlc_media_list_unlock( p_mlist );
+    }
 }
 
 /**************************************************************************
@@ -58,7 +89,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
                                              void * user_data )
 {
     input_item_t * p_item = p_event->u.services_discovery_item_added.p_new_item;
-    libvlc_media_descriptor_t * p_md;
+    libvlc_media_t * p_md;
     libvlc_media_discoverer_t * p_mdis = user_data;
 
     int i, count = libvlc_media_list_count( p_mdis->p_mlist, NULL );
@@ -68,7 +99,7 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
         p_md = libvlc_media_list_item_at_index( p_mdis->p_mlist, i, NULL );
         if( p_md->p_input_item == p_item )
         {
-            libvlc_media_list_remove_index( p_mdis->p_mlist, i, NULL );
+            _libvlc_media_list_remove_index( p_mdis->p_mlist, i, NULL );
             break;
         }
     }
@@ -82,9 +113,10 @@ static void services_discovery_item_removed( const vlc_event_t * p_event,
 static void services_discovery_started( const vlc_event_t * p_event,
                                         void * user_data )
 {
+    VLC_UNUSED(p_event);
     libvlc_media_discoverer_t * p_mdis = user_data;
     libvlc_event_t event;
-    p_mdis->running = VLC_TRUE;
+    p_mdis->running = true;
     event.type = libvlc_MediaDiscovererStarted;
     libvlc_event_send( p_mdis->p_event_manager, &event );
 }
@@ -96,9 +128,10 @@ static void services_discovery_started( const vlc_event_t * p_event,
 static void services_discovery_ended( const vlc_event_t * p_event,
                                       void * user_data )
 {
+    VLC_UNUSED(p_event);
     libvlc_media_discoverer_t * p_mdis = user_data;
     libvlc_event_t event;
-    p_mdis->running = VLC_FALSE;
+    p_mdis->running = false;
     event.type = libvlc_MediaDiscovererEnded;
     libvlc_event_send( p_mdis->p_event_manager, &event );
 }
@@ -118,7 +151,7 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
                                        libvlc_exception_t * p_e )
 {
     libvlc_media_discoverer_t * p_mdis;
- 
+
     p_mdis = malloc(sizeof(libvlc_media_discoverer_t));
     if( !p_mdis )
     {
@@ -128,7 +161,10 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
 
     p_mdis->p_libvlc_instance = p_inst;
     p_mdis->p_mlist = libvlc_media_list_new( p_inst, NULL );
-    p_mdis->running = VLC_FALSE;
+    p_mdis->p_mlist->b_read_only = true;
+    p_mdis->running = false;
+
+    vlc_dictionary_init( &p_mdis->catname_to_submedialist, 0 );
 
     p_mdis->p_event_manager = libvlc_event_manager_new( p_mdis,
             p_inst, NULL );
@@ -143,6 +179,7 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
     if( !p_mdis->p_sd )
     {
         free( p_mdis );
+        libvlc_media_list_release( p_mdis->p_mlist );
         libvlc_exception_raise( p_e, "Can't find the services_discovery module named '%s'", psz_name );
         return NULL;
     }
@@ -163,10 +200,16 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
                       vlc_ServicesDiscoveryEnded,
                       services_discovery_ended,
                       p_mdis );
- 
-    services_discovery_Start( p_mdis->p_sd );
 
     /* Here we go */
+    bool ret = services_discovery_Start( p_mdis->p_sd );
+    if(!ret)
+    {
+        free( p_mdis );
+        libvlc_media_list_release( p_mdis->p_mlist );
+        libvlc_exception_raise( p_e, "Can't start the services_discovery module named '%s'", psz_name );
+        return NULL;
+    }
 
     return p_mdis;
 }
@@ -177,8 +220,23 @@ libvlc_media_discoverer_new_from_name( libvlc_instance_t * p_inst,
 void
 libvlc_media_discoverer_release( libvlc_media_discoverer_t * p_mdis )
 {
+    int i;
+
     libvlc_media_list_release( p_mdis->p_mlist );
-    services_discovery_Destroy( p_mdis->p_sd );
+    services_discovery_StopAndRelease( p_mdis->p_sd );
+
+    /* Free catname_to_submedialist and all the mlist */
+    char ** all_keys = vlc_dictionary_all_keys( &p_mdis->catname_to_submedialist );
+    for( i = 0; all_keys[i]; i++ )
+    {
+        libvlc_media_list_t * p_catmlist = vlc_dictionary_value_for_key( &p_mdis->catname_to_submedialist, all_keys[i] );
+        libvlc_media_list_release( p_catmlist );
+        free( all_keys[i] );
+    }
+    free( all_keys );
+
+    vlc_dictionary_clear( &p_mdis->catname_to_submedialist );
+
     free( p_mdis );
 }
 
@@ -219,4 +277,3 @@ libvlc_media_discoverer_is_running( libvlc_media_discoverer_t * p_mdis )
 {
     return p_mdis->running;
 }
-