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

core: do not squash VLC_VERBOSE environment variable setting

It did not work at all anymore.
parent 0e3168b5
...@@ -102,7 +102,6 @@ libvlc_int_t * libvlc_InternalCreate( void ) ...@@ -102,7 +102,6 @@ libvlc_int_t * libvlc_InternalCreate( void )
{ {
libvlc_int_t *p_libvlc; libvlc_int_t *p_libvlc;
libvlc_priv_t *priv; libvlc_priv_t *priv;
char *psz_env = NULL;
/* Now that the thread system is initialized, we don't have much, but /* Now that the thread system is initialized, we don't have much, but
* at least we have variables */ * at least we have variables */
...@@ -117,13 +116,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) ...@@ -117,13 +116,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
priv->p_ml = NULL; priv->p_ml = NULL;
priv->p_dialog_provider = NULL; priv->p_dialog_provider = NULL;
priv->p_vlm = NULL; priv->p_vlm = NULL;
priv->i_verbose = 3; /* initial value until config is loaded */
/* Find verbosity from VLC_VERBOSE environment variable */
psz_env = getenv( "VLC_VERBOSE" );
if( psz_env != NULL )
priv->i_verbose = atoi( psz_env );
else
priv->i_verbose = 3;
#if defined( HAVE_ISATTY ) && !defined( WIN32 ) #if defined( HAVE_ISATTY ) && !defined( WIN32 )
priv->b_color = isatty( STDERR_FILENO ); /* 2 is for stderr */ priv->b_color = isatty( STDERR_FILENO ); /* 2 is for stderr */
#else #else
...@@ -172,6 +165,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, ...@@ -172,6 +165,13 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
} }
priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" ); priv->i_verbose = var_InheritInteger( p_libvlc, "verbose" );
/* Find verbosity from VLC_VERBOSE environment variable */
{
char *env = getenv( "VLC_VERBOSE" );
if( env != NULL )
priv->i_verbose = atoi( env );
}
/* Announce who we are (TODO: only first instance?) */ /* Announce who we are (TODO: only first instance?) */
msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE ); msg_Dbg( p_libvlc, "VLC media player - %s", VERSION_MESSAGE );
msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE ); msg_Dbg( p_libvlc, "%s", COPYRIGHT_MESSAGE );
......
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