Commit 00cd4276 authored by Laurent Aimar's avatar Laurent Aimar

Partial fix for media instance. (It was using input_control_e intead of

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.
parent 88461141
...@@ -430,10 +430,7 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, ...@@ -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 )) ) if( (p_input_thread = libvlc_get_input_thread( p_mi, p_e )) )
{ {
/* A thread alread exists, send it a play message */ /* A thread alread exists, send it a play message */
vlc_value_t val; input_Control( p_input_thread, INPUT_SET_STATE, PLAYING_S );
val.i_int = PLAYING_S;
input_Control( p_input_thread, INPUT_CONTROL_SET_STATE, PLAYING_S );
vlc_object_release( p_input_thread ); vlc_object_release( p_input_thread );
return; return;
} }
...@@ -476,16 +473,12 @@ void libvlc_media_instance_play( libvlc_media_instance_t *p_mi, ...@@ -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, void libvlc_media_instance_pause( libvlc_media_instance_t *p_mi,
libvlc_exception_t *p_e ) libvlc_exception_t *p_e )
{ {
input_thread_t * p_input_thread; input_thread_t * p_input_thread = libvlc_get_input_thread( p_mi, p_e );
vlc_value_t val;
val.i_int = PAUSE_S;
p_input_thread = libvlc_get_input_thread( p_mi, p_e );
if( !p_input_thread ) if( !p_input_thread )
return; 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 ); vlc_object_release( p_input_thread );
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment