Privatize p_interaction

diff --git a/include/vlc_main.h b/include/vlc_main.h
index a3066f86878492391f0e10db255c5ba0cd37b059..1f9ae736b4d9db08f030ab00300ae861d9bc7d16 100644 (file)
--- a/include/vlc_main.h
+++ b/include/vlc_main.h
@@ -47,8 +47,6 @@ struct libvlc_int_t
 
     playlist_t            *p_playlist;       ///< playlist object
 
-    vlc_object_t          *p_interaction;    ///< interface interaction object
-
     void                 *p_stats_computer;  ///< Input thread computing stats (needs cleanup)
     global_stats_t       *p_stats;           ///< Global statistics
 

diff --git a/src/libvlc-common.c b/src/libvlc-common.c
index 0403d34d9f95f796b316106160c65617f5a1f463..068392bb18246bdd4e6e81755acc63817542383e 100644 (file)
--- a/src/libvlc-common.c
+++ b/src/libvlc-common.c
@@ -180,7 +180,7 @@ libvlc_int_t * libvlc_InternalCreate( void )
 
     priv = libvlc_priv (p_libvlc);
     p_libvlc->p_playlist = NULL;
-    p_libvlc->p_interaction = NULL;
+    priv->p_interaction = NULL;
     priv->p_vlm = NULL;
     p_libvlc->psz_object_name = strdup( "libvlc" );
 
@@ -740,7 +740,7 @@ 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 );
@@ -988,7 +988,7 @@ int libvlc_InternalCleanup( libvlc_int_t *p_libvlc )
 
     /* 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 );

diff --git a/src/libvlc.h b/src/libvlc.h
index f3ae94b8e05a60030a1a8fbc93431339bef33ee5..8377dc9e4065a9fa683980c7646d85b3faba4793 100644 (file)
--- a/src/libvlc.h
+++ b/src/libvlc.h
@@ -223,7 +223,7 @@ typedef struct libvlc_priv_t
 
     module_t          *p_memcpy_module;  ///< Fast memcpy plugin used
     vlm_t             *p_vlm;  ///< VLM if created from libvlc-common.c
-
+    vlc_object_t      *p_interaction;    ///< interface interaction object
     httpd_t           *p_httpd; ///< HTTP daemon (src/network/httpd.c)
 } libvlc_priv_t;