Skip to content

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

input: ignore start-paused in non-interactive inputs

parent 9f85beee
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 6 deletions
src/input/input.c
View file @ 7e68d2bf
...@@ -524,12 +524,6 @@ static void *Run( void *obj ) ...@@ -524,12 +524,6 @@ static void *Run( void *obj )
if( !Init( p_input ) ) if( !Init( p_input ) )
{ {
if( var_InheritBool( p_input, "start-paused" ) )
{
const mtime_t i_control_date = mdate();
ControlPause( p_input, i_control_date );
}
MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */ MainLoop( p_input, true ); /* FIXME it can be wrong (like with VLM) */
/* Clean up */ /* Clean up */
...@@ -685,6 +679,10 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive ) ...@@ -685,6 +679,10 @@ static void MainLoop( input_thread_t *p_input, bool b_interactive )
mtime_t i_start_mdate = mdate(); mtime_t i_start_mdate = mdate();
mtime_t i_intf_update = 0; mtime_t i_intf_update = 0;
mtime_t i_last_seek_mdate = 0; mtime_t i_last_seek_mdate = 0;
if( b_interactive && var_InheritBool( p_input, "start-paused" ) )
ControlPause( p_input, i_start_mdate );
bool b_pause_after_eof = b_interactive && bool b_pause_after_eof = b_interactive &&
var_CreateGetBool( p_input, "play-and-pause" ); var_CreateGetBool( p_input, "play-and-pause" );
......
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