]> git.sesse.net Git - vlc/blobdiff - src/control/libvlc_internal.h
libvlc: Implement media_list_view, which will be used to present/access/edit the...
[vlc] / src / control / libvlc_internal.h
index 1e985e9bf1dde226782215102200b1dc790276fa..dd2f64d3ca80a3ff0b82b52dbefbc39f836cfa90 100644 (file)
 #ifndef _LIBVLC_INTERNAL_H
 #define _LIBVLC_INTERNAL_H 1
 
-# ifdef __cplusplus
-extern "C" {
-# endif
-
 #include <vlc/vlc.h>
 #include <vlc/libvlc_structures.h>
 
 #include <vlc_arrays.h>
 #include <vlc_input.h>
-    
+
+# ifdef __cplusplus
+extern "C" {
+# endif
+
 /***************************************************************************
  * Internal creation and destruction functions
  ***************************************************************************/
@@ -49,10 +49,19 @@ VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, vlc_boo
 VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *, libvlc_exception_t * ) );
 VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t *, libvlc_exception_t * ) );
 
+
 /***************************************************************************
  * Opaque structures for libvlc API
  ***************************************************************************/
 
+typedef int * libvlc_media_list_path_t; /* (Media List Player Internal) */
+
+typedef enum libvlc_lock_state_t
+{
+    libvlc_Locked,
+    libvlc_UnLocked
+} libvlc_lock_state_t;
+
 struct libvlc_instance_t
 {
     libvlc_int_t *p_libvlc_int;
@@ -63,6 +72,12 @@ struct libvlc_instance_t
     struct libvlc_callback_entry_list_t *p_callback_list;
 };
 
+struct libvlc_tags_storage_t
+{
+    char ** ppsz_tags;
+    int i_count;
+};
+
 struct libvlc_media_descriptor_t
 {
     libvlc_event_manager_t * p_event_manager;
@@ -71,25 +86,80 @@ struct libvlc_media_descriptor_t
     int                i_refcount;
     libvlc_instance_t *p_libvlc_instance;
     vlc_dictionary_t   tags; /* To be merged with core's meta soon */
+    struct libvlc_media_list_t *p_subitems; /* A media descriptor can have
+                                           * Sub item */
 };
 
 struct libvlc_tag_query_t
 {
     struct libvlc_instance_t  *p_libvlc_instance; /* Parent instance */
     int                i_refcount;
+    libvlc_tag_t       tag;
+    char *             psz_tag_key;
 };
 
-
 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;
-    libvlc_media_list_t *    p_media_provider; /* For dynamic sublist */
-    libvlc_tag_query_t *     p_query;              /* For dynamic sublist */
-    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;
+};
+
+/* A way to see a media list */
+struct libvlc_media_list_view_t
+{
+    libvlc_event_manager_t *    p_event_manager;
+    libvlc_instance_t *         p_libvlc_instance;
+    int                         i_refcount;
+    vlc_mutex_t                 object_lock;
+    
+    libvlc_media_list_t *       p_mlist;
+
+    void *                      this_view_data;
+
+    /* Accessors */
+    int (*pf_count)( struct libvlc_media_list_view_t * p_mlv,
+                      libvlc_exception_t * );
+    libvlc_media_descriptor_t *
+        (*pf_item_at_index)( struct libvlc_media_list_view_t * p_mlv,
+                              int index,
+                              libvlc_exception_t * );
+    int  (*pf_index_of_item)( struct libvlc_media_list_view_t * p_mlv,
+                              libvlc_media_descriptor_t * p_md,
+                              libvlc_exception_t * );
+
+    /* Setters */
+    void (*pf_insert_at_index)( struct libvlc_media_list_view_t * p_mlv,
+                                     libvlc_media_descriptor_t * p_md,
+                                     int index,
+                                     libvlc_exception_t * );
+    void (*pf_remove_at_index)( struct libvlc_media_list_view_t * p_mlv,
+                                     int index,
+                                     libvlc_exception_t * );
+    void (*pf_add_item)( struct libvlc_media_list_view_t * p_mlv,
+                         libvlc_media_descriptor_t * p_md,
+                         libvlc_exception_t * );
+        
+};
+
+struct libvlc_dynamic_media_list_t
+{
+    libvlc_instance_t *     p_libvlc_instance;
+    int                     i_refcount;
+    libvlc_media_list_t *   p_media_provider;
+    libvlc_tag_query_t *    p_query;
+    char *                  psz_tag_key;
+    libvlc_tag_t            tag;
+    struct libvlc_media_list_t *  p_mlist;
+    struct libvlc_media_list_t *  p_provider;
 };
 
 struct libvlc_media_instance_t
@@ -106,14 +176,14 @@ struct libvlc_media_instance_t
 
 struct libvlc_media_list_player_t
 {
-    libvlc_event_manager_t * p_event_manager;
-    libvlc_instance_t *      p_libvlc_instance;
-    int                      i_refcount;
-    vlc_mutex_t              object_lock;
-    int                      i_current_playing_index;
+    libvlc_event_manager_t *    p_event_manager;
+    libvlc_instance_t *         p_libvlc_instance;
+    int                         i_refcount;
+    vlc_mutex_t                 object_lock;
+    libvlc_media_list_path_t    current_playing_item_path;
     libvlc_media_descriptor_t * p_current_playing_item;
-    libvlc_media_list_t *    p_mlist;
-    libvlc_media_instance_t *  p_mi;
+    libvlc_media_list_t *       p_mlist;
+    libvlc_media_instance_t *   p_mi;
 };
 
 struct libvlc_media_library_t
@@ -132,7 +202,7 @@ struct libvlc_media_discoverer_t
     libvlc_media_list_t *    p_mlist;
 };
 
-/* 
+/*
  * Event Handling
  */
 /* Example usage
@@ -189,6 +259,8 @@ typedef struct libvlc_event_manager_t
     void * p_obj;
     struct libvlc_instance_t * p_libvlc_instance;
     DECL_ARRAY(libvlc_event_listeners_group_t *) listeners_groups;
+    vlc_mutex_t object_lock;
+    vlc_mutex_t event_sending_lock;
 } libvlc_event_sender_t;
 
 
@@ -212,6 +284,9 @@ VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_
 VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
                         ( libvlc_media_descriptor_t * ) );
 
+/* Media List */
+VLC_EXPORT ( void, libvlc_media_list_flat_media_list_release, ( libvlc_media_list_t * ) );
+
 /* Events */
 VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );
 
@@ -222,6 +297,8 @@ VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj,
 VLC_EXPORT (void, libvlc_event_manager_release, ( libvlc_event_manager_t * p_em ) );
 
 VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) );
+VLC_EXPORT (void, libvlc_event_detach_lock_state, ( libvlc_event_manager_t *p_event_manager, libvlc_event_type_t event_type, libvlc_callback_t pf_callback,
+                                                    void *p_user_data, libvlc_lock_state_t lockstate, libvlc_exception_t *p_e ) );
 
 VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );