control/media_list.c: Replace set_name/name by set_media_descriptor/media_descriptor...

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index a1aedf75e8c71591be1afa013f50bbb487216936..7a5c7b84755e476e889b96fe54bec946274d5ba1 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -453,13 +453,13 @@ VLC_PUBLIC_API void
                                         libvlc_exception_t * p_e );
 
 VLC_PUBLIC_API void
-    libvlc_media_list_set_name( libvlc_media_list_t *,
-                                const char * psz_name,
-                                libvlc_exception_t *);
+    libvlc_media_list_set_media_descriptor( libvlc_media_list_t *,
+                                            libvlc_media_descriptor_t *,
+                                            libvlc_exception_t *);
 
-VLC_PUBLIC_API char *
-    libvlc_media_list_name( libvlc_media_list_t *,
-                            libvlc_exception_t *);
+VLC_PUBLIC_API libvlc_media_descriptor_t *
+    libvlc_media_list_media_descriptor( libvlc_media_list_t *,
+                                        libvlc_exception_t *);
 
 VLC_PUBLIC_API void
     libvlc_media_list_add_media_descriptor( libvlc_media_list_t *,

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 803a618b9f04d4807caa8dda7cd32fa62866ce91..bbee575a4e43ccda6e9329636c320ed9a1f9d3b6 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -100,16 +100,17 @@ struct libvlc_tag_query_t
 
 struct libvlc_media_list_t
 {
-    libvlc_event_manager_t * p_event_manager;
-    libvlc_instance_t *      p_libvlc_instance;
-    int                      i_refcount;
-    vlc_mutex_t              object_lock;
-    char *                   psz_name; /* Usually NULL */
-    DECL_ARRAY(void *)       items;
+    libvlc_event_manager_t *    p_event_manager;
+    libvlc_instance_t *         p_libvlc_instance;
+    int                         i_refcount;
+    vlc_mutex_t                 object_lock;
+    libvlc_media_descriptor_t * p_md; /* The media_descriptor from which the
+                                       * mlist comes, if any. */
+    DECL_ARRAY(void *)          items;
     
     /* Other way to see that media list */
     /* Used in flat_media_list.c */
-    libvlc_media_list_t *    p_flat_mlist;
+    libvlc_media_list_t *       p_flat_mlist;
 };
 
 struct libvlc_dynamic_media_list_t

diff --git a/src/control/media_list.c b/src/control/media_list.c
index 3004b2a15f461e9ad3baecdf3e1a5ab7edde1598..6a70d743f13c28c4e4624dec701d8cf19546f36e 100644 (file)
--- a/src/control/media_list.c
+++ b/src/control/media_list.c
@@ -116,7 +116,7 @@ libvlc_media_list_new( libvlc_instance_t * p_inst,
     
     ARRAY_INIT(p_mlist->items);
     p_mlist->i_refcount = 1;
-    p_mlist->psz_name = NULL;
+    p_mlist->p_md = NULL;
 
     return p_mlist;
 }
@@ -146,6 +146,9 @@ void libvlc_media_list_release( libvlc_media_list_t * p_mlist )
 
     libvlc_event_manager_release( p_mlist->p_event_manager );
 
+    if( p_mlist->p_md )
+        libvlc_media_descriptor_release( p_mlist->p_md );
+
     FOREACH_ARRAY( p_md, p_mlist->items )
         libvlc_media_descriptor_release( p_md );
     FOREACH_END()
@@ -206,34 +209,45 @@ libvlc_media_list_add_file_content( libvlc_media_list_t * p_mlist,
 }
 
 /**************************************************************************
- *       set_name (Public)
+ *       set_media_descriptor (Public)
  **************************************************************************/
-void libvlc_media_list_set_name( libvlc_media_list_t * p_mlist,
-                                 const char * psz_name,
-                                 libvlc_exception_t * p_e)
+void libvlc_media_list_set_media_descriptor( libvlc_media_list_t * p_mlist,
+                                             libvlc_media_descriptor_t * p_md,
+                                             libvlc_exception_t * p_e)
 
 {
     (void)p_e;
     vlc_mutex_lock( &p_mlist->object_lock );
-    free( p_mlist->psz_name );
-    p_mlist->psz_name = psz_name ? strdup( psz_name ) : NULL;
+    if( p_mlist->p_md )
+        libvlc_media_descriptor_release( p_mlist->p_md );
+    libvlc_media_descriptor_retain( p_md );
+    p_mlist->p_md = p_md;
     vlc_mutex_unlock( &p_mlist->object_lock );
 }
 
 /**************************************************************************
- *       name (Public)
+ *       media_descriptor (Public)
+ *
+ * If this media_list comes is a media_descriptor's subitems,
+ * This holds the corresponding media_descriptor.
+ * This md is also seen as the information holder for the media_list.
+ * Indeed a media_list can have meta information through this
+ * media_descriptor.
  **************************************************************************/
-char * libvlc_media_list_name( libvlc_media_list_t * p_mlist,
-                               libvlc_exception_t * p_e)
+libvlc_media_descriptor_t *
+libvlc_media_list_media_descriptor( libvlc_media_list_t * p_mlist,
+                                    libvlc_exception_t * p_e)
 {
-    char *ret;
+    libvlc_media_descriptor_t *p_md;
     (void)p_e;
 
     vlc_mutex_lock( &p_mlist->object_lock );
-    ret = p_mlist->psz_name ? strdup( p_mlist->psz_name ) : NULL;
+    p_md = p_mlist->p_md;
+    if( p_md )
+        libvlc_media_descriptor_retain( p_md );
     vlc_mutex_unlock( &p_mlist->object_lock );
 
-    return ret;
+    return p_md;
 }
 
 /**************************************************************************