From e0a120ef811bdb2d1bccdde0838105f6dba99669 Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sun, 4 May 2008 20:37:05 +0300 Subject: [PATCH] p_vlm is private data --- include/vlc_main.h | 4 ---- src/libvlc-common.c | 11 ++++++----- src/libvlc.h | 3 +++ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/vlc_main.h b/include/vlc_main.h index 545eb74fc5..174c8f5f74 100644 --- a/include/vlc_main.h +++ b/include/vlc_main.h @@ -49,10 +49,6 @@ struct libvlc_int_t vlc_object_t *p_interaction; ///< interface interaction object - vlm_t *p_vlm; ///< vlm if created from libvlc-common. - /// (this is clearly private and - // shouldn't be used) - 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 5df3d8acdf..5c11207ce8 100644 --- a/src/libvlc-common.c +++ b/src/libvlc-common.c @@ -180,7 +180,7 @@ libvlc_int_t * libvlc_InternalCreate( void ) p_libvlc->p_playlist = NULL; p_libvlc->p_interaction = NULL; - p_libvlc->p_vlm = NULL; + priv->p_vlm = NULL; p_libvlc->psz_object_name = strdup( "libvlc" ); priv = libvlc_priv (p_libvlc); @@ -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,9 +980,9 @@ 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 diff --git a/src/libvlc.h b/src/libvlc.h index b0c3d9e706..b9cdb34623 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -178,6 +178,9 @@ typedef struct libvlc_priv_t bool b_stats; ///< Whether to collect stats module_t *p_memcpy_module; ///< Fast memcpy plugin used + vlm_t *p_vlm; ///< VLM if created from libvlc-common.c + + httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) -- 2.39.2