control/dynamic_media_list.c: New dynamic media list object. It shouldn't have great...

[vlc] / src / control / libvlc_internal.h

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index b9f462787b321a8e658dca2f59c7fae5e1220f5c..088c73964231c96543362805d782c31fbee9a2cd 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -65,9 +65,49 @@ struct libvlc_instance_t
 
 struct libvlc_media_descriptor_t
 {
+    libvlc_event_manager_t * p_event_manager;
     int                b_preparsed;
     input_item_t      *p_input_item;
+    int                i_refcount;
     libvlc_instance_t *p_libvlc_instance;
+    vlc_dictionary_t   tags; /* To be merged with core's meta soon */
+};
+
+struct libvlc_tag_query_t
+{
+    struct libvlc_instance_t  *p_libvlc_instance; /* Parent instance */
+    int                i_refcount;
+};
+
+struct libvlc_tree_t
+{
+    int     i_refcount;
+    void *  p_item; /* For dynamic sublist */
+    libvlc_retain_function  pf_item_retain;
+    libvlc_release_function pf_item_release;
+    DECL_ARRAY(struct libvlc_tree_t *)  subtrees; /* For dynamic sublist */
+};
+
+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;
+};
+
+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
@@ -76,10 +116,39 @@ struct libvlc_media_instance_t
     vlc_mutex_t        object_lock;
     int i_input_id;  /* Input object id. We don't use a pointer to
                         avoid any crash */
-    struct libvlc_instance_t  *p_libvlc_instance; /* Parent instance */
-    libvlc_media_descriptor_t *p_md; /* current media descriptor */
+    struct libvlc_instance_t *  p_libvlc_instance; /* Parent instance */
+    libvlc_media_descriptor_t * p_md; /* current media descriptor */
+    libvlc_event_manager_t *    p_event_manager;
+    libvlc_drawable_t           drawable;
+};
+
+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_media_descriptor_t * p_current_playing_item;
+    libvlc_media_list_t *    p_mlist;
+    libvlc_media_instance_t *  p_mi;
+};
+
+struct libvlc_media_library_t
+{
+    libvlc_event_manager_t * p_event_manager;
+    libvlc_instance_t *      p_libvlc_instance;
+    int                      i_refcount;
+    libvlc_media_list_t *    p_mlist;
 };
 
+struct libvlc_media_discoverer_t
+{
+    libvlc_event_manager_t * p_event_manager;
+    libvlc_instance_t *      p_libvlc_instance;
+    services_discovery_t *   p_sd;
+    libvlc_media_list_t *    p_mlist;
+};
 
 /* 
  * Event Handling
@@ -88,56 +157,56 @@ struct libvlc_media_instance_t
  *
  * struct libvlc_cool_object_t
  * {
- *             ...
- *             libvlc_event_manager_t * p_event_manager;
- *             ...
+ *        ...
+ *        libvlc_event_manager_t * p_event_manager;
+ *        ...
  * }
  *
  * libvlc_my_cool_object_new()
  * {
- *             ...
- *             p_self->p_event_manager = libvlc_event_manager_init( p_self,
- *                                                        p_self->p_libvlc_instance, p_e);
- *             libvlc_event_manager_register_event_type(p_self->p_event_manager,
- *                             libvlc_MyCoolObjectDidSomething, p_e)
- *             ...
+ *        ...
+ *        p_self->p_event_manager = libvlc_event_manager_init( p_self,
+ *                                                   p_self->p_libvlc_instance, p_e);
+ *        libvlc_event_manager_register_event_type(p_self->p_event_manager,
+ *                libvlc_MyCoolObjectDidSomething, p_e)
+ *        ...
  * }
  *
  * libvlc_my_cool_object_release()
  * {
- *             ...
- *             libvlc_event_manager_release( p_self->p_event_manager );
- *             ...
+ *         ...
+ *         libvlc_event_manager_release( p_self->p_event_manager );
+ *         ...
  * }
  *
  * libvlc_my_cool_object_do_something()
  * {
- *         ...
- *         libvlc_event_t event;
- *         event.type = libvlc_MyCoolObjectDidSomething;
- *         event.my_cool_object_did_something.what_it_did = kSomething;
- *         libvlc_event_send( p_self->p_event_manager, &event );
+ *        ...
+ *        libvlc_event_t event;
+ *        event.type = libvlc_MyCoolObjectDidSomething;
+ *        event.u.my_cool_object_did_something.what_it_did = kSomething;
+ *        libvlc_event_send( p_self->p_event_manager, &event );
  * }
  * */
 
 typedef struct libvlc_event_listener_t
 {
-       libvlc_event_type_t event_type;
-       void *              p_user_data;
-       libvlc_callback_t   pf_callback;
+    libvlc_event_type_t event_type;
+    void *              p_user_data;
+    libvlc_callback_t   pf_callback;
 } libvlc_event_listener_t;
 
 typedef struct libvlc_event_listeners_group_t
 {
-       libvlc_event_type_t event_type;
-       DECL_ARRAY(libvlc_event_listener_t *) listeners;
+    libvlc_event_type_t event_type;
+    DECL_ARRAY(libvlc_event_listener_t *) listeners;
 } libvlc_event_listeners_group_t;
 
 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;
+    void * p_obj;
+    struct libvlc_instance_t * p_libvlc_instance;
+    DECL_ARRAY(libvlc_event_listeners_group_t *) listeners_groups;
 } libvlc_event_sender_t;
 
 
@@ -166,7 +235,7 @@ VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exc
 
 VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );
 
-VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_init, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_exception_t *p_e ) );
+VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_exception_t *p_e ) );
 
 VLC_EXPORT (void, libvlc_event_manager_release, ( libvlc_event_manager_t * p_em ) );