Skip to content

V
vlc-1.1
Commit 0e2340e0 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Emit INPUT_EVENT_TITLE/SEEKPOINT when needed.

parent 6f54b381
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
src/input/input.c
View file @ 0e2340e0
...@@ -891,7 +891,7 @@ static void InitTitle( input_thread_t * p_input ) ...@@ -891,7 +891,7 @@ static void InitTitle( input_thread_t * p_input )
{ {
/* Setup variables */ /* Setup variables */
input_ControlVarNavigation( p_input ); input_ControlVarNavigation( p_input );
input_ControlVarTitle( p_input, 0 ); input_SendEventTitle( p_input, 0 );
} }
/* Global flag */ /* Global flag */
...@@ -1880,7 +1880,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1880,7 +1880,7 @@ static bool Control( input_thread_t *p_input, int i_type,
es_out_SetTime( p_input->p->p_es_out, -1 ); es_out_SetTime( p_input->p->p_es_out, -1 );
demux_Control( p_demux, DEMUX_SET_TITLE, i_title ); demux_Control( p_demux, DEMUX_SET_TITLE, i_title );
input_ControlVarTitle( p_input, i_title ); input_SendEventTitle( p_input, i_title );
} }
} }
else if( p_input->p->input.i_title > 0 ) else if( p_input->p->input.i_title > 0 )
...@@ -1901,6 +1901,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1901,6 +1901,7 @@ static bool Control( input_thread_t *p_input, int i_type,
stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
ACCESS_SET_TITLE, i_title ); ACCESS_SET_TITLE, i_title );
input_SendEventTitle( p_input, i_title );
} }
} }
break; break;
...@@ -1946,6 +1947,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1946,6 +1947,7 @@ static bool Control( input_thread_t *p_input, int i_type,
es_out_SetTime( p_input->p->p_es_out, -1 ); es_out_SetTime( p_input->p->p_es_out, -1 );
demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint ); demux_Control( p_demux, DEMUX_SET_SEEKPOINT, i_seekpoint );
input_SendEventSeekpoint( p_input, p_demux->info.i_title, i_seekpoint );
} }
} }
else if( p_input->p->input.i_title > 0 ) else if( p_input->p->input.i_title > 0 )
...@@ -1980,6 +1982,7 @@ static bool Control( input_thread_t *p_input, int i_type, ...@@ -1980,6 +1982,7 @@ static bool Control( input_thread_t *p_input, int i_type,
stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS, stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
ACCESS_SET_SEEKPOINT, i_seekpoint ); ACCESS_SET_SEEKPOINT, i_seekpoint );
input_SendEventSeekpoint( p_input, p_access->info.i_title, i_seekpoint );
} }
} }
break; break;
......
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