Commit 3eccc276 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Remote Control: use var_Inherit

parent 4b9bc90d
...@@ -220,14 +220,14 @@ static int Activate( vlc_object_t *p_this ) ...@@ -220,14 +220,14 @@ 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( !config_GetInt( p_intf, "rc-fake-tty" ) && !isatty( 0 ) ) if( !var_InheritInteger( 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;
} }
#endif #endif
psz_unix_path = config_GetPsz( p_intf, "rc-unix" ); psz_unix_path = var_InheritString( p_intf, "rc-unix" );
if( psz_unix_path ) if( psz_unix_path )
{ {
int i_socket; int i_socket;
...@@ -295,7 +295,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -295,7 +295,7 @@ static int Activate( vlc_object_t *p_this )
#endif /* !WIN32 */ #endif /* !WIN32 */
if( ( pi_socket == NULL ) && if( ( pi_socket == NULL ) &&
( psz_host = config_GetPsz( p_intf, "rc-host" ) ) != NULL ) ( psz_host = var_InheritString( p_intf, "rc-host" ) ) != NULL )
{ {
vlc_url_t url; vlc_url_t url;
...@@ -334,7 +334,7 @@ static int Activate( vlc_object_t *p_this ) ...@@ -334,7 +334,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 = config_GetInt( p_intf, "rc-quiet" ); p_intf->p_sys->b_quiet = var_InheritInteger( 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;
...@@ -447,7 +447,7 @@ static void Run( intf_thread_t *p_intf ) ...@@ -447,7 +447,7 @@ static void Run( intf_thread_t *p_intf )
playlist_t * p_playlist = pl_Hold( p_intf ); playlist_t * p_playlist = pl_Hold( p_intf );
char p_buffer[ MAX_LINE_LENGTH + 1 ]; char p_buffer[ MAX_LINE_LENGTH + 1 ];
bool b_showpos = config_GetInt( p_intf, "rc-show-pos" ); bool b_showpos = var_InheritInteger( 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