Skip to content

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

Old RC: correct inherited boolean variables 

(cherry picked from commit 972e458c)
parent 6910ff5d
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
modules/control/rc.c
View file @ 0b0efe3d
...@@ -215,7 +215,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -215,7 +215,7 @@ static int Activate( vlc_object_t *p_this )
#ifndef WIN32 #ifndef WIN32
#if defined(HAVE_ISATTY) #if defined(HAVE_ISATTY)
/* Check that stdin is a TTY */ /* Check that stdin is a TTY */
if( !var_InheritInteger( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) if( !var_InheritBool( p_intf, "rc-fake-tty" ) && !isatty( 0 ) )
{ {
msg_Warn( p_intf, "fd 0 is not a TTY" ); msg_Warn( p_intf, "fd 0 is not a TTY" );
return VLC_EGENERIC; return VLC_EGENERIC;
...@@ -329,7 +329,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -329,7 +329,7 @@ static int Activate( vlc_object_t *p_this )
p_intf->pf_run = Run; p_intf->pf_run = Run;
#ifdef WIN32 #ifdef WIN32
p_intf->p_sys->b_quiet = var_InheritInteger( p_intf, "rc-quiet" ); p_intf->p_sys->b_quiet = var_InheritBool( p_intf, "rc-quiet" );
if( !p_intf->p_sys->b_quiet ) { CONSOLE_INTRO_MSG; } if( !p_intf->p_sys->b_quiet ) { CONSOLE_INTRO_MSG; }
#else #else
CONSOLE_INTRO_MSG; CONSOLE_INTRO_MSG;
...@@ -442,7 +442,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -442,7 +442,7 @@ static void Run( intf_thread_t *p_intf )
playlist_t * p_playlist = pl_Get( p_intf ); playlist_t * p_playlist = pl_Get( p_intf );
char p_buffer[ MAX_LINE_LENGTH + 1 ]; char p_buffer[ MAX_LINE_LENGTH + 1 ];
bool b_showpos = var_InheritInteger( p_intf, "rc-show-pos" ); bool b_showpos = var_InheritBool( p_intf, "rc-show-pos" );
bool b_longhelp = false; bool b_longhelp = false;
int i_size = 0; int i_size = 0;
......
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