Skip to content

V
vlc
Commit a87b4b35 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

input: factor INPUT_CONTROL_SET_TITLE code

parent b8214f77
Show whitespace changes
Inline Side-by-side
Showing with 23 additions and 42 deletions
src/input/input.c
View file @ a87b4b35
...@@ -1893,56 +1893,37 @@ static bool Control( input_thread_t *p_input, ...@@ -1893,56 +1893,37 @@ static bool Control( input_thread_t *p_input,
case INPUT_CONTROL_SET_TITLE: case INPUT_CONTROL_SET_TITLE:
case INPUT_CONTROL_SET_TITLE_NEXT: case INPUT_CONTROL_SET_TITLE_NEXT:
case INPUT_CONTROL_SET_TITLE_PREV: case INPUT_CONTROL_SET_TITLE_PREV:
{
if( p_input->p->b_recording ) if( p_input->p->b_recording )
{ {
msg_Err( p_input, "INPUT_CONTROL_SET_TITLE(*) ignored while recording" ); msg_Err( p_input, "INPUT_CONTROL_SET_TITLE(*) ignored while recording" );
break; break;
} }
if( p_input->p->input.b_title_demux && if( p_input->p->input.i_title <= 0 )
p_input->p->input.i_title > 0 ) break;
{
/* TODO */
/* FIXME handle demux title */
demux_t *p_demux = p_input->p->input.p_demux;
int i_title;
int i_title = p_input->p->input.b_title_demux
? p_input->p->input.p_demux->info.i_title
: p_input->p->input.p_access->info.i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV ) if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
i_title = p_demux->info.i_title - 1; i_title--;
else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT ) else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
i_title = p_demux->info.i_title + 1; i_title++;
else else
i_title = val.i_int; i_title = val.i_int;
if( i_title < 0 || i_title >= p_input->p->input.i_title )
break;
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
es_out_SetTime( p_input->p->p_es_out, -1 ); es_out_SetTime( p_input->p->p_es_out, -1 );
if( p_input->p->input.b_title_demux )
demux_Control( p_demux, DEMUX_SET_TITLE, i_title ); demux_Control( p_input->p->input.p_demux,
input_SendEventTitle( p_input, i_title ); DEMUX_SET_TITLE, i_title );
}
}
else if( p_input->p->input.i_title > 0 )
{
access_t *p_access = p_input->p->input.p_access;
int i_title;
if( i_type == INPUT_CONTROL_SET_TITLE_PREV )
i_title = p_access->info.i_title - 1;
else if( i_type == INPUT_CONTROL_SET_TITLE_NEXT )
i_title = p_access->info.i_title + 1;
else else
i_title = val.i_int; stream_Control( p_input->p->input.p_stream,
STREAM_CONTROL_ACCESS, ACCESS_SET_TITLE, i_title );
if( i_title >= 0 && i_title < p_input->p->input.i_title )
{
es_out_SetTime( p_input->p->p_es_out, -1 );
stream_Control( p_input->p->input.p_stream, STREAM_CONTROL_ACCESS,
ACCESS_SET_TITLE, i_title );
input_SendEventTitle( p_input, i_title ); input_SendEventTitle( p_input, i_title );
}
}
break; break;
}
case INPUT_CONTROL_SET_SEEKPOINT: case INPUT_CONTROL_SET_SEEKPOINT:
case INPUT_CONTROL_SET_SEEKPOINT_NEXT: case INPUT_CONTROL_SET_SEEKPOINT_NEXT:
case INPUT_CONTROL_SET_SEEKPOINT_PREV: case INPUT_CONTROL_SET_SEEKPOINT_PREV:
......
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