From 0a9fffb92ed32d042bc16f76a3c4735d60c6f086 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 4 May 2008 20:34:54 +0300 Subject: [PATCH] p_memcpy_module is private libvlc data --- include/vlc_main.h | 2 -- src/libvlc-common.c | 12 ++++++------ src/libvlc.h | 2 ++ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/vlc_main.h b/include/vlc_main.h index c6af9c286b..545eb74fc5 100644 --- a/include/vlc_main.h +++ b/include/vlc_main.h @@ -66,8 +66,6 @@ struct libvlc_int_t int i_verbose; ///< info messages bool b_color; ///< color messages? - module_t * p_memcpy_module; ///< Fast memcpy plugin used - /* Structure storing the action name / key associations */ struct hotkey { diff --git a/src/libvlc-common.c b/src/libvlc-common.c index 2e648d4ace..5df3d8acdf 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -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; @@ -747,9 +747,9 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc, 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; @@ -1056,10 +1056,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 */ diff --git a/src/libvlc.h b/src/libvlc.h index 4483a12a46..b0c3d9e706 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -176,6 +176,8 @@ typedef struct libvlc_priv_t counter_t **pp_timers; ///< Array of all timers int i_timers; ///< Number of timers bool b_stats; ///< Whether to collect stats + + module_t *p_memcpy_module; ///< Fast memcpy plugin used } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) -- 2.39.2