control/media_descriptor.c: Give access to the subitems.

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index fbed72953ecbd615f36752e0ec29ec05fd73eafe..5bc745313c0d9f99afe0d9fd6ed4d83b007b167b 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -233,6 +233,10 @@ VLC_PUBLIC_API libvlc_tag_t
                                                   const char * key,
                                                   libvlc_exception_t *p_e );
 
+VLC_PUBLIC_API libvlc_media_list_t *
+    libvlc_media_descriptor_subitems( libvlc_media_descriptor_t *p_md,
+                                      libvlc_exception_t *p_e );
+
 /** @}*/
 
 /*****************************************************************************

diff --git a/src/control/media_descriptor.c b/src/control/media_descriptor.c
index 77955b442b7bf7aafc1e391b86ce59fe36ba3181..2c49a99b71e322750cb87ef533959483f79e83c6 100644 (file)
--- a/src/control/media_descriptor.c
+++ b/src/control/media_descriptor.c
@@ -253,7 +253,8 @@ void libvlc_media_descriptor_release( libvlc_media_descriptor_t *p_md )
     if( p_md->i_refcount > 0 )
         return;
 
-    libvlc_media_list_release( p_md->p_subitems );
+    if( p_md->p_subitems )
+        libvlc_media_list_release( p_md->p_subitems );
 
     uninstall_input_item_observer( p_md );
     vlc_gc_decref( p_md->p_input_item );
@@ -437,3 +438,14 @@ libvlc_media_descriptor_tag_at_index_for_key( libvlc_media_descriptor_t *p_md,
     return strdup( p_ts->ppsz_tags[i] );
 }
 
+/**************************************************************************
+ * subitems
+ **************************************************************************/
+libvlc_media_list_t *
+libvlc_media_descriptor_subitems( libvlc_media_descriptor_t * p_md,
+                                  libvlc_exception_t * p_e )
+{
+    libvlc_media_list_retain( p_md->p_subitems );
+    return p_md->p_subitems;
+}
+