]> git.sesse.net Git - vlc/blobdiff - src/control/media_descriptor.c
control/media_descriptor.c: Implement libvlc_media_descriptor_new_as_node.
[vlc] / src / control / media_descriptor.c
index 03762a7411f0ae8fe54420f4d3a35531f67502d9..0c16f78027ff22ba84887f8ebb69f3e99ca77a9c 100644 (file)
@@ -83,13 +83,16 @@ static void input_item_subitem_added( const vlc_event_t *p_event,
     libvlc_event_t event;
 
     p_md_child = libvlc_media_descriptor_new_from_input_item(
-                p_md->p_libvlc_instance, 
+                p_md->p_libvlc_instance,
                 p_event->u.input_item_subitem_added.p_new_child, NULL );
 
     /* Add this to our media list */
     if( !p_md->p_subitems )
+    {
         p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
-    if( !p_md->p_subitems )
+        libvlc_media_list_set_media_descriptor( p_md->p_subitems, p_md, NULL );
+    }
+    if( p_md->p_subitems )
     {
         libvlc_media_list_add_media_descriptor( p_md->p_subitems, p_md_child, NULL );
     }
@@ -121,6 +124,41 @@ static void input_item_meta_changed( const vlc_event_t *p_event,
     libvlc_event_send( p_md->p_event_manager, &event );
 }
 
+/**************************************************************************
+ * input_item_duration_changed (Private) (vlc event Callback)
+ **************************************************************************/
+static void input_item_duration_changed( const vlc_event_t *p_event,
+                                         void * user_data )
+{
+    libvlc_media_descriptor_t * p_md = user_data;
+    libvlc_event_t event;
+
+    /* Construct the event */
+    event.type = libvlc_MediaDescriptorDurationChanged;
+    event.u.media_descriptor_duration_changed.new_duration = 
+        p_event->u.input_item_duration_changed.new_duration;
+
+    /* Send the event */
+    libvlc_event_send( p_md->p_event_manager, &event );
+}
+
+/**************************************************************************
+ * input_item_preparsed_changed (Private) (vlc event Callback)
+ **************************************************************************/
+static void input_item_preparsed_changed( const vlc_event_t *p_event,
+                                          void * user_data )
+{
+    libvlc_media_descriptor_t * p_md = user_data;
+    libvlc_event_t event;
+
+    /* Construct the event */
+    event.type = libvlc_MediaDescriptorPreparsedChanged;
+    event.u.media_descriptor_preparsed_changed.new_status = 
+        p_event->u.input_item_preparsed_changed.new_status;
+
+    /* Send the event */
+    libvlc_event_send( p_md->p_event_manager, &event );
+}
 
 /**************************************************************************
  * Install event handler (Private)
@@ -135,6 +173,14 @@ static void install_input_item_observer( libvlc_media_descriptor_t *p_md )
                       vlc_InputItemMetaChanged,
                       input_item_meta_changed,
                       p_md );
+    vlc_event_attach( &p_md->p_input_item->event_manager,
+                      vlc_InputItemDurationChanged,
+                      input_item_duration_changed,
+                      p_md );
+    vlc_event_attach( &p_md->p_input_item->event_manager,
+                      vlc_InputItemPreparsedChanged,
+                      input_item_preparsed_changed,
+                      p_md );
 }
 
 /**************************************************************************
@@ -150,6 +196,14 @@ static void uninstall_input_item_observer( libvlc_media_descriptor_t *p_md )
                       vlc_InputItemMetaChanged,
                       input_item_meta_changed,
                       p_md );
+    vlc_event_detach( &p_md->p_input_item->event_manager,
+                      vlc_InputItemDurationChanged,
+                      input_item_duration_changed,
+                      p_md );
+    vlc_event_detach( &p_md->p_input_item->event_manager,
+                      vlc_InputItemPreparsedChanged,
+                      input_item_preparsed_changed,
+                      p_md );
 }
 
 /**************************************************************************
@@ -192,8 +246,9 @@ libvlc_media_descriptor_t * libvlc_media_descriptor_new_from_input_item(
     p_md = malloc( sizeof(libvlc_media_descriptor_t) );
     p_md->p_libvlc_instance = p_instance;
     p_md->p_input_item      = p_input_item;
-    p_md->b_preparsed       = VLC_TRUE;
+    p_md->b_preparsed       = VLC_FALSE;
     p_md->i_refcount        = 1;
+    p_md->p_user_data       = NULL; // VLC.framework hook
 
     /* A media descriptor can be a playlist. When you open a playlist
      * It can give a bunch of item to read. */
@@ -202,10 +257,14 @@ libvlc_media_descriptor_t * libvlc_media_descriptor_new_from_input_item(
     vlc_dictionary_init( &p_md->tags, 1 );
 
     p_md->p_event_manager = libvlc_event_manager_new( p_md, p_instance, p_e );
-    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
+    libvlc_event_manager_register_event_type( p_md->p_event_manager,
         libvlc_MediaDescriptorMetaChanged, p_e );
-    libvlc_event_manager_register_event_type( p_md->p_event_manager, 
+    libvlc_event_manager_register_event_type( p_md->p_event_manager,
         libvlc_MediaDescriptorSubItemAdded, p_e );
+    libvlc_event_manager_register_event_type( p_md->p_event_manager,
+        libvlc_MediaDescriptorFreed, p_e );
+    libvlc_event_manager_register_event_type( p_md->p_event_manager,
+        libvlc_MediaDescriptorDurationChanged, p_e );
 
     vlc_gc_incref( p_md->p_input_item );
 
@@ -239,6 +298,50 @@ libvlc_media_descriptor_t * libvlc_media_descriptor_new(
     return p_md;
 }
 
+/**************************************************************************
+ * Create a new media descriptor object
+ **************************************************************************/
+libvlc_media_descriptor_t * libvlc_media_descriptor_new_as_node(
+                                   libvlc_instance_t *p_instance,
+                                   const char * psz_name,
+                                   libvlc_exception_t *p_e )
+{
+    input_item_t * p_input_item;
+    libvlc_media_descriptor_t * p_md;
+
+    p_input_item = input_ItemNew( p_instance->p_libvlc_int, "vlc:nop", psz_name );
+
+    if (!p_input_item)
+    {
+        libvlc_exception_raise( p_e, "Can't create md's input_item" );
+        return NULL;
+    }
+
+    p_md = libvlc_media_descriptor_new_from_input_item( p_instance,
+                p_input_item, p_e );
+
+    p_md->p_subitems = libvlc_media_list_new( p_md->p_libvlc_instance, NULL );
+
+    return p_md;
+}
+
+/**************************************************************************
+ * Add an option to the media descriptor,
+ * that will be used to determine how the media_instance will read the
+ * media_descriptor. This allow to use VLC advanced reading/streaming
+ * options in a per-media basis
+ *
+ * The options are detailled in vlc --long-help, for instance "--sout-all"
+ **************************************************************************/
+void libvlc_media_descriptor_add_option(
+                                   libvlc_media_descriptor_t * p_md,
+                                   const char * ppsz_option,
+                                   libvlc_exception_t *p_e )
+{
+    (void)p_e;
+    input_ItemAddOptionNoDup( p_md->p_input_item, ppsz_option );
+}
+
 /**************************************************************************
  * Delete a media descriptor object
  **************************************************************************/
@@ -259,6 +362,16 @@ void libvlc_media_descriptor_release( libvlc_media_descriptor_t *p_md )
     uninstall_input_item_observer( p_md );
     vlc_gc_decref( p_md->p_input_item );
 
+    /* Construct the event */
+    libvlc_event_t event;
+    event.type = libvlc_MediaDescriptorFreed;
+    event.u.media_descriptor_freed.md = p_md;
+
+    /* Send the event */
+    libvlc_event_send( p_md->p_event_manager, &event );
+
+    libvlc_event_manager_release( p_md->p_event_manager );
+
     char ** all_keys = vlc_dictionary_all_keys( &p_md->tags );
     for( i = 0; all_keys[i]; i++ )
     {
@@ -346,7 +459,7 @@ void libvlc_media_descriptor_add_tag( libvlc_media_descriptor_t *p_md,
 
     if( !tag || !key )
         return;
-    
     p_ts = vlc_dictionary_value_for_key( &p_md->tags, key );
 
     if( !p_ts )
@@ -360,7 +473,7 @@ void libvlc_media_descriptor_add_tag( libvlc_media_descriptor_t *p_md,
         p_ts->ppsz_tags = malloc(sizeof(char*)*(p_ts->i_count));
     else
         p_ts->ppsz_tags = realloc(p_ts->ppsz_tags, sizeof(char*)*(p_ts->i_count));
-        
     p_ts->ppsz_tags[p_ts->i_count-1] = strdup( tag );
 }
 
@@ -378,7 +491,7 @@ void libvlc_media_descriptor_remove_tag( libvlc_media_descriptor_t *p_md,
 
     if( !tag || !key )
         return;
-    
     p_ts = vlc_dictionary_value_for_key( &p_md->tags, key );
 
     if( !p_ts )
@@ -408,7 +521,7 @@ int libvlc_media_descriptor_tags_count_for_key( libvlc_media_descriptor_t *p_md,
 
     if( !key )
         return 0;
-    
     p_ts = vlc_dictionary_value_for_key( &p_md->tags, key );
 
     if( !p_ts )
@@ -429,12 +542,12 @@ libvlc_media_descriptor_tag_at_index_for_key( libvlc_media_descriptor_t *p_md,
 
     if( !key )
         return NULL;
-    
     p_ts = vlc_dictionary_value_for_key( &p_md->tags, key );
 
     if( !p_ts )
         return NULL;
-    
     return strdup( p_ts->ppsz_tags[i] );
 }
 
@@ -459,3 +572,73 @@ libvlc_media_descriptor_event_manager( libvlc_media_descriptor_t * p_md,
 {
     return p_md->p_event_manager;
 }
+
+/**************************************************************************
+ * Get duration of media_descriptor object.
+ **************************************************************************/
+vlc_int64_t
+libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
+                                      libvlc_exception_t * p_e )
+{
+    if( p_md && p_md->p_input_item)
+    {
+        return input_item_GetDuration( p_md->p_input_item );
+    }
+    else
+    {
+        return -1;
+    }
+}
+
+/**************************************************************************
+ * Get preparsed status for media_descriptor object.
+ **************************************************************************/
+vlc_bool_t
+libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
+                                       libvlc_exception_t * p_e )
+{
+    if( p_md && p_md->p_input_item)
+    {
+        return input_item_IsPreparsed( p_md->p_input_item );
+    }
+    else
+    {
+        return VLC_FALSE;
+    }
+}
+
+/**************************************************************************
+ * Sets media descriptor's user_data. user_data is specialized data 
+ * accessed by the host application, VLC.framework uses it as a pointer to 
+ * an native object that references a libvlc_media_descriptor_t pointer
+ **************************************************************************/
+void 
+libvlc_media_descriptor_set_user_data( libvlc_media_descriptor_t * p_md,
+                                       void * p_new_user_data,
+                                       libvlc_exception_t * p_e )
+{
+    if( p_md )
+    {
+        p_md->p_user_data = p_new_user_data;
+    }
+}
+
+/**************************************************************************
+ * Get media descriptor's user_data. user_data is specialized data 
+ * accessed by the host application, VLC.framework uses it as a pointer to 
+ * an native object that references a libvlc_media_descriptor_t pointer
+ **************************************************************************/
+void *
+libvlc_media_descriptor_get_user_data( libvlc_media_descriptor_t * p_md,
+                                       libvlc_exception_t * p_e )
+{
+    if( p_md )
+    {
+        return p_md->p_user_data;
+    }
+    else
+    {
+        return NULL;
+    }
+}
+