Changeset 7b32ae177048eb0bc36b6f7610b9e8a1fb22fead

Timestamp:

20/10/07 19:56:00 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

Pierre d'Herbemont <pdherbemont@videolan.org> 1192902960 +0000

git-parent:

[bba8b97ecc1c4f5530eeeec1f10363a3665a964c]

git-author:

Pierre d'Herbemont <pdherbemont@videolan.org> 1192902960 +0000

Message:

src/control: (Patch by Enrique Osuna)
* Add the ability to store user data in media_descriptor.
* Duration can now be retrieved from a media_instance
* Can new get the preparsed state of a media_descriptor
* Add callbacks for libvlc_MediaDescriptorDurationChanged/vlc_InputItemDurationChanged and libvlc_MediaDescriptorPreparsedChanged/vlc_InputItemPreparsedChanged.

Files:

• include/vlc/libvlc.h (modified) (1 diff)
• include/vlc/libvlc_structures.h (modified) (2 diffs)
• include/vlc_events.h (modified) (2 diffs)
• include/vlc_input.h (modified) (3 diffs)
• src/control/libvlc_internal.h (modified) (1 diff)
• src/control/media_descriptor.c (modified) (6 diffs)
• src/control/media_instance.c (modified) (1 diff)

include/vlc/libvlc.h

@@ -190 +190 @@
-                                           libvlc_exception_t * p_e );
-
+VLC_PUBLIC_API vlc_int64_t
+   libvlc_media_descriptor_get_duration( libvlc_media_descriptor_t * p_md,
+                                         libvlc_exception_t * p_e );
+                                         
+VLC_PUBLIC_API vlc_bool_t
+   libvlc_media_descriptor_is_preparsed( libvlc_media_descriptor_t * p_md,
+                                         libvlc_exception_t * p_e );
+
+VLC_PUBLIC_API void 
+    libvlc_media_descriptor_set_user_data( libvlc_media_descriptor_t * p_md,
+                                           void * p_new_user_data,
+                                           libvlc_exception_t * p_e);
+VLC_PUBLIC_API void *
+    libvlc_media_descriptor_get_user_data( libvlc_media_descriptor_t * p_md,
+                                           libvlc_exception_t * p_e);
+
-/** @}*/
-

include/vlc/libvlc_structures.h

@@ -297 +297 @@
-    libvlc_MediaDescriptorMetaChanged,
-    libvlc_MediaDescriptorSubItemAdded,
+    libvlc_MediaDescriptorDurationChanged,
+    libvlc_MediaDescriptorPreparsedChanged,
-
-    libvlc_MediaInstancePlayed,
@@ -334 +336 @@
-            libvlc_media_descriptor_t * new_child;
-        } media_descriptor_subitem_added;
-
+
+
+
+
+
+
+
+
+
-        /* media instance */
-        struct

include/vlc_events.h

@@ -115 +115 @@
-    vlc_InputItemMetaChanged,
-    vlc_InputItemSubItemAdded,
+    vlc_InputItemDurationChanged,
+    vlc_InputItemPreparsedChanged,
-
-    /* Service Discovery event */
@@ -137 +139 @@
-            input_item_t * p_new_child;
-        } input_item_subitem_added;
-
+
+
+
+
+
+
+
+
+
-        /* Service discovery events */
-        struct vlc_services_discovery_item_added

include/vlc_input.h

@@ -121 +121 @@
-    vlc_event_manager_register_event_type( &p_i->event_manager,
-        vlc_InputItemSubItemAdded );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemDurationChanged );
+    vlc_event_manager_register_event_type( &p_i->event_manager,
+        vlc_InputItemPreparsedChanged );
-}
-
@@ -303 +307 @@
-static inline void input_item_SetDuration( input_item_t * p_i, mtime_t i_duration )
-{
+    vlc_bool_t send_event = VLC_FALSE;
+
-    vlc_mutex_lock( &p_i->lock );
-
+
+
+
+
+
-    vlc_mutex_unlock( &p_i->lock );
+    
+    if ( send_event == VLC_TRUE )
+    {
+        vlc_event_t event;
+        event.type = vlc_InputItemDurationChanged;
+        event.u.input_item_duration_changed.new_duration = i_duration;
+        vlc_event_send( &p_i->event_manager, &event );
+    }
+    
-    return;
-}
@@ -311 +330 @@
-static inline void input_item_SetPreparsed( input_item_t *p_i, vlc_bool_t preparsed )
-{
+    vlc_bool_t send_event = VLC_FALSE;
+
-    if( !p_i->p_meta )
-        p_i->p_meta = vlc_meta_New();
-
+    vlc_mutex_lock( &p_i->lock );
+    int new_status;
-    if( preparsed )
-p_i->p_meta->i_status |=
+new_status = p_i->p_meta->i_status |
-    else
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-

src/control/libvlc_internal.h

@@ -89 +89 @@
-    struct libvlc_media_list_t *p_subitems; /* A media descriptor can have
-                                           * Sub item */
+    void *p_user_data; /* Allows for VLC.framework to hook into media descriptor without creating a new VLCMedia object. */
-};
-

src/control/media_descriptor.c

@@ -125 +125 @@
-}
-
+/**************************************************************************
+ * 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 );
+}
-
-/**************************************************************************
@@ -139 +174 @@
-                      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 );
-}
-
@@ -153 +196 @@
-                      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 );
-}
@@ -198 +249 @@
-    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
@@ -210 +262 @@
-    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_MediaDescriptorDurationChanged, p_e );
-
-    vlc_gc_incref( p_md->p_input_item );
@@ -463 +517 @@
-    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;
+    }
+}

src/control/media_instance.c

@@ -308 +308 @@
-    {
-        libvlc_event_manager_release( p_mi->p_event_manager );
+        libvlc_exception_clear( &p_e );
-        free( p_mi );
-        return; /* no need to worry about no input thread */