vlc_input.h: Fix funman's commit.

[vlc] / include / vlc_input.h

diff --git a/include/vlc_input.h b/include/vlc_input.h
index 66e22fdc8bd7770c233b0a9511a940ed956c7926..90d7ab6d5024678073b00e549738f96066a17122 100644 (file)
--- a/include/vlc_input.h
+++ b/include/vlc_input.h
@@ -33,6 +33,7 @@
 #include <vlc_es.h>
 #include <vlc_meta.h>
 #include <vlc_epg.h>
+#include <vlc_events.h>
 
 struct vlc_meta_t;
 
@@ -79,7 +80,9 @@ struct input_item_t
     int           i_nb_played;       /**< Number of times played */
 
     vlc_meta_t *p_meta;
-    
+
+    vlc_event_manager_t event_manager;
+
     vlc_mutex_t lock;                 /**< Lock for the item */
 };
 
@@ -111,6 +114,11 @@ static inline void input_ItemInit( vlc_object_t *p_o, input_item_t *p_i )
     p_i->p_meta = NULL;
 
     vlc_mutex_init( p_o, &p_i->lock );
+    vlc_event_manager_init( &p_i->event_manager, p_i, p_o );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemMetaChanged );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemSubItemAdded );
 }
 
 static inline void input_ItemCopyOptions( input_item_t *p_parent,
@@ -128,6 +136,29 @@ static inline void input_ItemCopyOptions( input_item_t *p_parent,
     }
 }
 
+static inline void input_ItemSetName( input_item_t *p_item, const char *psz_name )
+{
+    if( p_item->psz_name ) free( p_item->psz_name );
+    p_item->psz_name = strdup( psz_name );
+}
+
+/* This won't hold the item, but can tell to interested third parties
+ * Like the playlist, that there is a new sub item. With this design
+ * It is not the input item's responsability to keep all the ref of
+ * the input item children. */
+static inline void input_ItemAddSubItem( input_item_t *p_parent,
+                                         input_item_t *p_child )
+{
+    vlc_event_t event;
+
+    p_parent->i_type = ITEM_TYPE_PLAYLIST;
+
+    /* Notify interested third parties */
+    event.type = vlc_InputItemSubItemAdded;
+    event.u.input_item_subitem_added.p_new_child = p_child;
+    vlc_event_send( &p_parent->event_manager, &event );
+}
+
 VLC_EXPORT( void, input_ItemAddOption,( input_item_t *, const char * ) );
 VLC_EXPORT( void, input_ItemAddOptionNoDup,( input_item_t *, const char * ) );
 
@@ -135,6 +166,8 @@ static inline void input_ItemClean( input_item_t *p_i )
 {
     int i;
 
+    vlc_event_manager_fini( &p_i->event_manager );
+
     free( p_i->psz_name );
     free( p_i->psz_uri );
     if( p_i->p_stats )
@@ -187,16 +220,44 @@ static inline void input_ItemClean( input_item_t *p_i )
 
 static inline void input_item_SetMeta( input_item_t *p_i, vlc_meta_type_t meta_type, const char *psz_val )
 {
+    vlc_event_t event;
+
+    vlc_mutex_lock( &p_i->lock );
     if( !p_i->p_meta )
         p_i->p_meta = vlc_meta_New();
     vlc_meta_Set( p_i->p_meta, meta_type, psz_val );
+    vlc_mutex_unlock( &p_i->lock ); 
+
+    /* Notify interested third parties */
+    event.type = vlc_InputItemMetaChanged;
+    event.u.input_item_meta_changed.meta_type = meta_type;
+    vlc_event_send( &p_i->event_manager, &event );
 }
 
-static inline const char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type )
+static inline char * input_item_GetMeta( input_item_t *p_i, vlc_meta_type_t meta_type )
 {
+    char * psz = NULL;
+    vlc_mutex_lock( &p_i->lock );
+
     if( !p_i->p_meta )
+    {
+        vlc_mutex_unlock( &p_i->lock );
         return NULL;
-    return vlc_meta_Get( p_i->p_meta, meta_type );
+    }
+
+    if( vlc_meta_Get( p_i->p_meta, meta_type ) )
+        psz = strdup( vlc_meta_Get( p_i->p_meta, meta_type ) );
+
+    vlc_mutex_unlock( &p_i->lock );
+    return psz;
+}
+
+static inline char * input_item_GetName( input_item_t *p_i )
+{
+    vlc_mutex_lock( &p_i->lock );
+    char *psz_s = p_i->psz_name ? strdup( p_i->psz_name ) : NULL;
+    vlc_mutex_unlock( &p_i->lock );
+    return psz_s;
 }
 
 static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t preparsed )
@@ -310,6 +371,7 @@ static inline void input_item_MetaMerge( input_item_t *p_i, const vlc_meta_t * p
 #define input_item_GetEncodedBy( item )      input_item_GetMeta( item, vlc_meta_EncodedBy )
 #define input_item_GetArtURL( item )         input_item_GetMeta( item, vlc_meta_ArtworkURL )
 #define input_item_GetTrackID( item )        input_item_GetMeta( item, vlc_meta_TrackID )
+#define input_item_GetSetting( item )        input_item_GetMeta( item, vlc_meta_Setting )
 
 VLC_EXPORT( char *, input_ItemGetInfo, ( input_item_t *p_i, const char *psz_cat,const char *psz_name ) );
 VLC_EXPORT(int, input_ItemAddInfo, ( input_item_t *p_i, const char *psz_cat, const char *psz_name, const char *psz_format, ... ) );