]> git.sesse.net Git - vlc/commitdiff
Partial fix for media instance. (It was using input_control_e intead of
authorLaurent Aimar <fenrir@videolan.org>
Sun, 30 Sep 2007 22:20:31 +0000 (22:20 +0000)
committerLaurent Aimar <fenrir@videolan.org>
Sun, 30 Sep 2007 22:20:31 +0000 (22:20 +0000)
input_query_e).

Btw input_internal.h is an internal header for src/input/* ONLY.
If input/control/* need it, then it is BROKEN (or there is a missing
functionnality, just ask for it then)
 I see it calling demux2_Control, this will segfault if you are unlucky.
 Accessing directly to p_input->p member is also forbidden.

src/control/media_instance.c

index 332cd06cafb3add6b3d91c395da36a97777b9cc6..506c778555a1573e1e2c73b5f6c1696fdc0810e7 100644 (file)
@@ -430,10 +430,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
     if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
     {
         /* A thread alread exists, send it a play message */
-        vlc_value_t val;
-        val.i_int = PLAYING_S;
-
-        input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S );
+        input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
         vlc_object_release( p_input_thread );
         return;
     }
@@ -476,16 +473,12 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi,
 void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi,
                                   libvlc_exception_t *p_e )
 {
-    input_thread_t * p_input_thread;
-    vlc_value_t val;
-    val.i_int = PAUSE_S;
-
-    p_input_thread = libvlc_get_input_thread( p_mi, p_e );
+    input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
 
     if( !p_input_thread )
         return;
 
-    input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, val );
+    input_Control( p_input_thread, INPUT_SET_STATE, PAUSE_S );
     vlc_object_release( p_input_thread );
 }