Changeset 48f7ca7f70c7228ce8863813aabe89e0f0ae848c

Timestamp:

29/12/07 02:29:48 (1 year ago)

Author:

Pierre d'Herbemont <pdherbemont@videolan.org>

git-committer:

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

git-parent:

[8a7b94a1bbfa35cdfd9c5555e75362191546f991]

git-author:

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

Message:

control/media_instance.c:
* Implement MediaInstancePositionChanged? and MediaInstanceTimeChanged? accurately.
control/event.c:
* Register the all event types.
* Don't strdup() in libvlc_event_type_name().

Files:

• include/vlc/libvlc_structures.h (modified) (3 diffs)
• src/control/event.c (modified) (3 diffs)
• src/control/media_instance.c (modified) (6 diffs)

include/vlc/libvlc_structures.h

@@ -306 +306 @@
-    libvlc_MediaInstancePaused,
-    libvlc_MediaInstanceReachedEnd,
+    libvlc_MediaInstanceTimeChanged,
-    libvlc_MediaInstancePositionChanged,
-
@@ -369 +370 @@
-        struct
-        {
-long in
+floa
-        } media_instance_position_changed;
+        struct
+        {
+            long int new_time;
+        } media_instance_time_changed;
-
-        /* media list */
@@ -415 +420 @@
-            int index;
-        } media_list_view_will_delete_item;
-
+
+
-        struct
-        {

src/control/event.c

@@ -214 +214 @@
-    EVENT(libvlc_MediaDescriptorPreparsedChanged),
-    EVENT(libvlc_MediaDescriptorFreed),
+    EVENT(libvlc_MediaDescriptorStateChanged),
-
-    EVENT(libvlc_MediaInstancePlayed),
-    EVENT(libvlc_MediaInstancePaused),
-    EVENT(libvlc_MediaInstanceReachedEnd),
+    EVENT(libvlc_MediaInstanceTimeChanged),
-    EVENT(libvlc_MediaInstancePositionChanged),
-
@@ -232 +234 @@
-    EVENT(libvlc_MediaListPlayerPlayed),
-    EVENT(libvlc_MediaListPlayerNextItemSet),
-
+
+
+
+
-#undef EVENT
-};
@@ -241 +246 @@
-    if( event_type >= sizeof(event_type_to_name)/sizeof(event_type_to_name[0]))
-        return unkwown_event_name;
-strdup(event_type_to_name[event_type])
+event_type_to_name[event_type]
-}
-

src/control/media_instance.c

@@ -133 +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 */
@@ -148 +147 @@
-            break;
-        case PLAYING_S:
-                printf("PLAYING_S!!!!!!!!\n");
-            libvlc_media_descriptor_set_state( p_mi->p_md, libvlc_Playing, NULL);
-            event.type = libvlc_MediaInstancePlayed;
@@ -174 +172 @@
-    libvlc_media_instance_t * p_mi = p_userdata;
-    vlc_value_t val;
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    if (!strncmp(psz_cmd, "intf", 4 /* "-change" no need to go further */))
-    {
@@ -192 +222 @@
-
-    libvlc_event_t event;
-Position
-position_changed.new_position
+Time
+time_changed.new_time
-
-    libvlc_event_send( p_mi->p_event_manager, &event );
@@ -248 +278 @@
-    libvlc_event_manager_register_event_type( p_mi->p_event_manager,
-            libvlc_MediaInstancePositionChanged, p_e );
+    libvlc_event_manager_register_event_type( p_mi->p_event_manager,
+            libvlc_MediaInstanceTimeChanged, p_e );
-
-    return p_mi;
@@ -496 +528 @@
-    var_AddCallback( p_input_thread, "state", input_state_changed, p_mi );
-    var_AddCallback( p_input_thread, "intf-change", input_position_changed, p_mi );
+    var_AddCallback( p_input_thread, "intf-change", input_time_changed, p_mi );
-
-    /* will be released in media_instance_release() */