control: Implement and export media_list_view_children_for_item()

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 4d8df140873b24a67dc468b5924bd634f87a1208..9d6774ec5ae29542d0c353c1af4c6a3f0d81ef85 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -616,6 +616,11 @@ VLC_PUBLIC_API libvlc_media_list_view_t *
                                            int index,
                                            libvlc_exception_t * p_e );
 
+VLC_PUBLIC_API libvlc_media_list_view_t *
+    libvlc_media_list_view_children_for_item(  libvlc_media_list_view_t * p_mlv,
+                                           libvlc_media_descriptor_t * p_md,
+                                           libvlc_exception_t * p_e );
+
 
 VLC_PUBLIC_API int
     libvlc_media_list_view_index_of_item(  libvlc_media_list_view_t * p_mlv,

diff --git a/src/control/flat_media_list_view.c b/src/control/flat_media_list_view.c
index d9ca590ea3482e91c86cb94d27a69592b3388202..1a7170b5917e71706c798d47b0d74c7f643f92d5 100644 (file)
--- a/src/control/flat_media_list_view.c
+++ b/src/control/flat_media_list_view.c
@@ -113,6 +113,7 @@ flat_media_list_view_children_at_index( libvlc_media_list_view_t * p_mlv,
                                         int index,
                                         libvlc_exception_t * p_e )
 {
+    (void)p_mlv; (void)index; (void)p_e;
     return NULL;
 }
 
@@ -174,6 +175,7 @@ libvlc_media_list_flat_view( libvlc_media_list_t * p_mlist,
                                         flat_media_list_view_count,
                                         flat_media_list_view_item_at_index,
                                         flat_media_list_view_children_at_index,
+                                        libvlc_media_list_flat_view,
                                         flat_media_list_view_release,
                                         p_this_view_data,
                                         p_e );

diff --git a/src/control/hierarchical_media_list_view.c b/src/control/hierarchical_media_list_view.c
index 9795e5e7b845aa7d3f447dfe868bf568c0b69976..3f18eb5da313e8c8d4659a921d5f15068f553826 100644 (file)
--- a/src/control/hierarchical_media_list_view.c
+++ b/src/control/hierarchical_media_list_view.c
@@ -168,6 +168,7 @@ libvlc_media_list_hierarchical_view( libvlc_media_list_t * p_mlist,
                                         hierarch_media_list_view_count,
                                         hierarch_media_list_view_item_at_index,
                                         hierarch_media_list_view_children_at_index,
+                                        libvlc_media_list_hierarchical_view,
                                         hierarch_media_list_view_release,
                                         NULL,
                                         p_e );

diff --git a/src/control/hierarchical_node_media_list_view.c b/src/control/hierarchical_node_media_list_view.c
index f548c5848d1cb10988553cdbed2bdac2cef63381..36a91476c7303690b898596762edbb9d4bcc51df 100644 (file)
--- a/src/control/hierarchical_node_media_list_view.c
+++ b/src/control/hierarchical_node_media_list_view.c
@@ -287,6 +287,7 @@ libvlc_media_list_hierarchical_node_view( libvlc_media_list_t * p_mlist,
                                         hierarch_node_media_list_view_count,
                                         hierarch_node_media_list_view_item_at_index,
                                         hierarch_node_media_list_view_children_at_index,
+                                        libvlc_media_list_hierarchical_node_view,
                                         hierarch_node_media_list_view_release,
                                         NULL,
                                         p_e );

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 524b793e667198e13a74ea420e59d0c6275608fc..9fdc5c6d4745c2bcbb095181b3ba78723411bcd0 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -124,6 +124,7 @@ struct libvlc_media_list_t
     vlc_bool_t                  b_read_only;
 };
 
+typedef libvlc_media_list_view_t * (*libvlc_media_list_view_constructor_func_t)( libvlc_media_list_t * p_mlist, libvlc_exception_t * p_e ) ;
 typedef void (*libvlc_media_list_view_release_func_t)( libvlc_media_list_view_t * p_mlv ) ;
 
 typedef int (*libvlc_media_list_view_count_func_t)( libvlc_media_list_view_t * p_mlv,
@@ -158,6 +159,7 @@ struct libvlc_media_list_view_t
     libvlc_media_list_view_item_at_index_func_t      pf_item_at_index;
     libvlc_media_list_view_children_at_index_func_t  pf_children_at_index;
 
+    libvlc_media_list_view_constructor_func_t         pf_constructor;
     libvlc_media_list_view_release_func_t            pf_release;
 
     /* Notification callback */
@@ -326,6 +328,7 @@ VLC_EXPORT ( libvlc_media_list_view_t *, libvlc_media_list_view_new,
                             libvlc_media_list_view_count_func_t pf_count,
                             libvlc_media_list_view_item_at_index_func_t pf_item_at_index,
                             libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
+                            libvlc_media_list_view_constructor_func_t pf_constructor,
                             libvlc_media_list_view_release_func_t pf_release,
                             void * this_view_data,
                             libvlc_exception_t * p_e ) );

diff --git a/src/control/media_list_view.c b/src/control/media_list_view.c
index 8a734dc8525174d8bc78775583826083dd262100..35a5f1452bc45779363fd6cff2db04e9f215d98f 100644 (file)
--- a/src/control/media_list_view.c
+++ b/src/control/media_list_view.c
@@ -294,6 +294,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
                             libvlc_media_list_view_count_func_t pf_count,
                             libvlc_media_list_view_item_at_index_func_t pf_item_at_index,
                             libvlc_media_list_view_children_at_index_func_t pf_children_at_index,
+                            libvlc_media_list_view_constructor_func_t pf_constructor,
                             libvlc_media_list_view_release_func_t pf_release,
                             void * this_view_data,
                             libvlc_exception_t * p_e )
@@ -322,6 +323,7 @@ libvlc_media_list_view_new( libvlc_media_list_t * p_mlist,
     p_mlv->pf_count             = pf_count;
     p_mlv->pf_item_at_index     = pf_item_at_index;
     p_mlv->pf_children_at_index = pf_children_at_index;
+    p_mlv->pf_constructor       = pf_constructor;
     p_mlv->pf_release           = pf_release;
 
     p_mlv->p_this_view_data = this_view_data;
@@ -424,6 +426,27 @@ libvlc_media_list_view_parent_media_list( libvlc_media_list_view_t * p_mlv,
     return p_mlist;
 }
 
+/**************************************************************************
+ *       libvlc_media_list_view_children_for_item (Public)
+ **************************************************************************/
+libvlc_media_list_view_t *
+libvlc_media_list_view_children_for_item( libvlc_media_list_view_t * p_mlv,
+                                          libvlc_media_descriptor_t * p_md,
+                                          libvlc_exception_t * p_e)
+{
+    (void)p_e;
+    libvlc_media_list_t * p_mlist;
+    libvlc_media_list_view_t * ret;
+
+    p_mlist = libvlc_media_descriptor_subitems(p_md, p_e);
+    if(!p_mlist) return NULL;
+
+    ret = p_mlv->pf_constructor( p_mlist, p_e );
+    libvlc_media_list_release( p_mlist );
+
+    return ret;
+}
+
 /* Limited to four args, because it should be enough */
 
 #define AN_SELECT( collapser, dec1, dec2, dec3, dec4, p, ...) p