Changeset 141e740fbee112b7d8ac61e5842d85670eda7399

Timestamp:

24/12/07 19:45:10 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[f2c77da9820cf07e455417f2636561cc338759b4]

git-author:

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

Message:

control/media_descriptor.c: Publish an Event plus a method to get the media_descriptor state, which is buffering, playing, error, nothing special. This is a bit controversial as we need a media_instance to set that state, and this is media_instance dependant. However, this is a nice shortcut.

Files:

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

include/vlc/libvlc.h

@@ -197 +197 @@
-                                   libvlc_exception_t *p_e );
-
+VLC_PUBLIC_API libvlc_state_t libvlc_media_descriptor_get_state(
+                                   libvlc_media_descriptor_t *p_meta_desc,
+                                   libvlc_exception_t *p_e );
+
-/* Tags */
-VLC_PUBLIC_API void libvlc_media_descriptor_add_tag( libvlc_media_descriptor_t *p_md,

include/vlc/libvlc_structures.h

@@ -123 +123 @@
-typedef enum libvlc_state_t
-{
+    libvlc_NothingSpecial,
-    libvlc_Stopped,
-    libvlc_Opening,
@@ -300 +301 @@
-    libvlc_MediaDescriptorPreparsedChanged,
-    libvlc_MediaDescriptorFreed,
+    libvlc_MediaDescriptorStateChanged,
-
-    libvlc_MediaInstancePlayed,
@@ -356 +358 @@
-            libvlc_media_descriptor_t * md;
-        } media_descriptor_freed;
+        struct
+        {
+            libvlc_state_t new_state;
+        } media_descriptor_state_changed;
-            
-        /* media instance */

src/control/libvlc_internal.h

@@ -88 +88 @@
-    libvlc_instance_t *p_libvlc_instance;
-    vlc_dictionary_t   tags; /* To be merged with core's meta soon */
+    libvlc_state_t     state;
-    struct libvlc_media_list_t *p_subitems; /* A media descriptor can have
-                                           * Sub item */
@@ -292 +293 @@
-VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
-                        ( libvlc_media_descriptor_t * ) );
+
+VLC_EXPORT (void, libvlc_media_descriptor_set_state,
+                        ( libvlc_media_descriptor_t *, libvlc_state_t, libvlc_exception_t * ) );
-
-/* Media List View */

src/control/media_descriptor.c

@@ -249 +249 @@
-    p_md->b_preparsed       = VLC_FALSE;
-    p_md->i_refcount        = 1;
-
+
+
+
-
-    /* A media descriptor can be a playlist. When you open a playlist
@@ -266 +268 @@
-    libvlc_event_manager_register_event_type( p_md->p_event_manager,
-        libvlc_MediaDescriptorDurationChanged, p_e );
+    libvlc_event_manager_register_event_type( p_md->p_event_manager,
+        libvlc_MediaDescriptorStateChanged, p_e );
-
-    vlc_gc_incref( p_md->p_input_item );
@@ -452 +456 @@
-
-/**************************************************************************
+ * Getter for state information
+ * Can be error, playing, buffering, NothingSpecial.
+ **************************************************************************/
+
+libvlc_state_t
+libvlc_media_descriptor_get_state( libvlc_media_descriptor_t *p_md,
+                                   libvlc_exception_t *p_e )
+{
+    (void)p_e;
+    return p_md->state;
+}
+
+/**************************************************************************
+ * Setter for state information (LibVLC Internal)
+ **************************************************************************/
+
+void
+libvlc_media_descriptor_set_state( libvlc_media_descriptor_t *p_md,
+                                   libvlc_state_t state,
+                                   libvlc_exception_t *p_e )
+{
+    (void)p_e;
+    libvlc_event_t event;
+
+    p_md->state = state;
+
+    /* Construct the event */
+    event.type = libvlc_MediaDescriptorStateChanged;
+    event.u.media_descriptor_state_changed.new_state = state;
+
+    /* Send the event */
+    libvlc_event_send( p_md->p_event_manager, &event );
+}
+
+/**************************************************************************
- * Add a tag
- **************************************************************************/

src/control/media_instance.c

@@ -28 +28 @@
-#include "libvlc.h"
-
+static const libvlc_state_t vlc_to_libvlc_state_array[] =
+{
+    [INIT_S]        = libvlc_Opening,
+    [OPENING_S]     = libvlc_Opening,
+    [BUFFERING_S]   = libvlc_Buffering,    
+    [PLAYING_S]     = libvlc_Playing,    
+    [PAUSE_S]       = libvlc_Paused,    
+    [END_S]         = libvlc_Ended,    
+    [ERROR_S]       = libvlc_Error,    
+};
+static inline libvlc_state_t vlc_to_libvlc_state( int vlc_state )
+{
+    if( vlc_state < 0 || vlc_state > 6 )
+        return libvlc_Stopped;
+
+    return vlc_to_libvlc_state_array[vlc_state];
+}
+
-/*
- * Release the associated input thread
@@ -115 +133 @@
-    libvlc_event_t event;
-
+    printf("input_state_changed!!!!!!!!\n");
-    if( newval.i_int == oldval.i_int )
-        return VLC_SUCCESS; /* No change since last time, don't propagate */
@@ -121 +140 @@
-    {
-        case END_S:
+            libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_NothingSpecial, NULL);
-            event.type = libvlc_MediaInstanceReachedEnd;
-            break;
-        case PAUSE_S:
+            libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Playing, NULL);
-            event.type = libvlc_MediaInstancePaused;
-            break;
-        case PLAYING_S:
+                printf("PLAYING_S!!!!!!!!\n");
+            libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Playing, NULL);
+            event.type = libvlc_MediaInstancePlayed;
+            break;
+        case ERROR_S:
+            libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Error, NULL);
-            event.type = libvlc_MediaInstancePlayed;
-            break;
@@ -730 +757 @@
-}
-
-static const libvlc_state_t vlc_to_libvlc_state[] =
-{
-    [INIT_S]        = libvlc_Opening,
-    [OPENING_S]     = libvlc_Opening,
-    [BUFFERING_S]   = libvlc_Buffering,    
-    [PLAYING_S]     = libvlc_Playing,    
-    [PAUSE_S]       = libvlc_Paused,    
-    [END_S]         = libvlc_Ended,    
-    [ERROR_S]       = libvlc_Error,    
-};
-
-libvlc_state_t libvlc_media_instance_get_state(
-                                 libvlc_media_instance_t *p_mi,
@@ -755 +771 @@
-    vlc_object_release( p_input_thread );
-
-
-
-
-
-
+
+