[vlc-devel] commit: Remote Control: use var_Inherit ( Rémi Denis-Courmont )

git version control git at videolan.org
Wed Dec 30 20:52:22 CET 2009


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Dec 30 21:37:16 2009 +0200| [3eccc27645f2e3b238da025f1a2230d8ae68d219] | committer: Rémi Denis-Courmont 

Remote Control: use var_Inherit

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3eccc27645f2e3b238da025f1a2230d8ae68d219
---

 modules/control/rc.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/control/rc.c b/modules/control/rc.c
index 7df6606..a0934fe 100644
--- a/modules/control/rc.c
+++ b/modules/control/rc.c
@@ -220,14 +220,14 @@ static int Activate( vlc_object_t *p_this )
 #ifndef WIN32
 #if defined(HAVE_ISATTY)
     /* 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" );
         return VLC_EGENERIC;
     }
 #endif
 
-    psz_unix_path = config_GetPsz( p_intf, "rc-unix" );
+    psz_unix_path = var_InheritString( p_intf, "rc-unix" );
     if( psz_unix_path )
     {
         int i_socket;
@@ -295,7 +295,7 @@ static int Activate( vlc_object_t *p_this )
 #endif /* !WIN32 */
 
     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;
 
@@ -334,7 +334,7 @@ static int Activate( vlc_object_t *p_this )
     p_intf->pf_run = Run;
 
 #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; }
 #else
     CONSOLE_INTRO_MSG;
@@ -447,7 +447,7 @@ static void Run( intf_thread_t *p_intf )
     playlist_t *     p_playlist = pl_Hold( p_intf );
 
     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;
 
     int  i_size = 0;




More information about the vlc-devel mailing list