Privatize p_interaction

[vlc] / src / libvlc-common.c

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 2e648d4ace09c64a0408a4d3ca6d4c1c6d350de3..068392bb18246bdd4e6e81755acc63817542383e 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -178,11 +178,11 @@ libvlc_int_t * libvlc_InternalCreate( void )
     if( p_libvlc == NULL )
         return NULL;
 
+    priv = libvlc_priv (p_libvlc);
     p_libvlc->p_playlist = NULL;
-    p_libvlc->p_interaction = NULL;
-    p_libvlc->p_vlm = NULL;
+    priv->p_interaction = NULL;
+    priv->p_vlm = NULL;
     p_libvlc->psz_object_name = strdup( "libvlc" );
-    priv = libvlc_priv (p_libvlc);
 
     /* Initialize message queue */
     msg_Create( p_libvlc );
@@ -190,13 +190,13 @@ libvlc_int_t * libvlc_InternalCreate( void )
     /* Find verbosity from VLC_VERBOSE environment variable */
     psz_env = getenv( "VLC_VERBOSE" );
     if( psz_env != NULL )
-        p_libvlc->i_verbose = atoi( psz_env );
+        priv->i_verbose = atoi( psz_env );
     else
-        p_libvlc->i_verbose = 3;
+        priv->i_verbose = 3;
 #if defined( HAVE_ISATTY ) && !defined( WIN32 )
-    p_libvlc->b_color = isatty( 2 ); /* 2 is for stderr */
+    priv->b_color = isatty( 2 ); /* 2 is for stderr */
 #else
-    p_libvlc->b_color = false;
+    priv->b_color = false;
 #endif
 
     /* Announce who we are - Do it only for first instance ? */
@@ -313,7 +313,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     }
 
     /* Will be re-done properly later on */
-    p_libvlc->i_verbose = config_GetInt( p_libvlc, "verbose" );
+    priv->i_verbose = config_GetInt( p_libvlc, "verbose" );
 
     /* Check for daemon mode */
 #ifndef WIN32
@@ -656,8 +656,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_AddCallback( p_libvlc, "verbose", VerboseCallback, NULL );
     var_Change( p_libvlc, "verbose", VLC_VAR_TRIGGER_CALLBACKS, NULL, NULL );
 
-    if( p_libvlc->b_color )
-        p_libvlc->b_color = config_GetInt( p_libvlc, "color" ) > 0;
+    if( priv->b_color )
+        priv->b_color = config_GetInt( p_libvlc, "color" ) > 0;
 
     /*
      * Output messages that may still be in the queue
@@ -708,7 +708,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     /*
      * Choose the best memcpy module
      */
-    p_libvlc->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
+    priv->p_memcpy_module = module_Need( p_libvlc, "memcpy", "$memcpy", 0 );
 
     priv->b_stats = config_GetInt( p_libvlc, "stats" ) > 0;
     priv->i_timers = 0;
@@ -740,16 +740,16 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
                      p_libvlc->p_hotkeys );
 
     /* Initialize interaction */
-    p_libvlc->p_interaction = interaction_Init( p_libvlc );
+    priv->p_interaction = interaction_Init( p_libvlc );
 
     /* Initialize playlist and get commandline files */
     playlist_ThreadCreate( p_libvlc );
     if( !p_libvlc->p_playlist )
     {
         msg_Err( p_libvlc, "playlist initialization failed" );
-        if( p_libvlc->p_memcpy_module != NULL )
+        if( priv->p_memcpy_module != NULL )
         {
-            module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
+            module_Unneed( p_libvlc, priv->p_memcpy_module );
         }
         module_EndBank( p_libvlc );
         return VLC_EGENERIC;
@@ -769,8 +769,8 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     psz_parser = config_GetPsz( p_libvlc, "vlm-conf" );
     if( psz_parser && *psz_parser )
     {
-        p_libvlc->p_vlm = vlm_New( p_libvlc );
-        if( !p_libvlc->p_vlm )
+        priv->p_vlm = vlm_New( p_libvlc );
+        if( !priv->p_vlm )
             msg_Err( p_libvlc, "VLM initialization failed" );
     }
     free( psz_parser );
@@ -932,6 +932,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     intf_thread_t      * p_intf = NULL;
     vout_thread_t      * p_vout = NULL;
     aout_instance_t    * p_aout = NULL;
+    libvlc_priv_t      *priv = libvlc_priv (p_libvlc);
 
     /* Ask the interfaces to stop and destroy them */
     msg_Dbg( p_libvlc, "removing all interfaces" );
@@ -979,15 +980,15 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
     }
 
     /* Destroy VLM if created in libvlc_InternalInit */
-    if( p_libvlc->p_vlm )
+    if( priv->p_vlm )
     {
-        vlm_Delete( p_libvlc->p_vlm );
+        vlm_Delete( priv->p_vlm );
     }
 #endif
 
     /* Free interaction */
     msg_Dbg( p_libvlc, "removing interaction" );
-    vlc_object_release( p_libvlc->p_interaction );
+    vlc_object_release( priv->p_interaction );
 
     stats_TimersDumpAll( p_libvlc );
     stats_TimersCleanAll( p_libvlc );
@@ -1056,10 +1057,10 @@ int libvlc_InternalDestroy( libvlc_int_t *p_libvlc, bool b_release )
     }
 #endif
 
-    if( p_libvlc->p_memcpy_module )
+    if( priv->p_memcpy_module )
     {
-        module_Unneed( p_libvlc, p_libvlc->p_memcpy_module );
-        p_libvlc->p_memcpy_module = NULL;
+        module_Unneed( p_libvlc, priv->p_memcpy_module );
+        priv->p_memcpy_module = NULL;
     }
 
     /* Free module bank. It is refcounted, so we call this each time  */
@@ -1972,7 +1973,7 @@ static int VerboseCallback( vlc_object_t *p_this, const char *psz_variable,
 
     if( new_val.i_int >= -1 )
     {
-        p_libvlc->i_verbose = __MIN( new_val.i_int, 2 );
+        libvlc_priv (p_libvlc)->i_verbose = __MIN( new_val.i_int, 2 );
     }
     return VLC_SUCCESS;
 }