From acc91d372a52a64cda5128ed9defa26a654a332c Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Sat, 19 May 2007 20:49:48 +0000 Subject: [PATCH] Move OSD and TLS to instance. --- src/network/tls.c | 6 +++--- src/osd/osd.c | 22 +++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/network/tls.c b/src/network/tls.c index a6a59ea3b7..d434bf2d64 100644 --- a/src/network/tls.c +++ b/src/network/tls.c @@ -37,8 +37,8 @@ tls_Init( vlc_object_t *p_this ) tls_t *p_tls; vlc_value_t lockval; - var_Create( p_this->p_libvlc_global, "tls_mutex", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc_global, "tls_mutex", &lockval ); + var_Create( p_this->p_libvlc, "tls_mutex", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "tls_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_tls = vlc_object_find( p_this, VLC_OBJECT_TLS, FIND_ANYWHERE ); @@ -76,7 +76,7 @@ tls_Deinit( tls_t *p_tls ) int i; vlc_value_t lockval; - var_Get( p_tls->p_libvlc_global, "tls_mutex", &lockval ); + var_Get( p_tls->p_libvlc, "tls_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); vlc_object_release( p_tls ); diff --git a/src/osd/osd.c b/src/osd/osd.c index 83012e0f94..75f6cc4a30 100644 --- a/src/osd/osd.c +++ b/src/osd/osd.c @@ -61,8 +61,8 @@ osd_menu_t *__osd_MenuCreate( vlc_object_t *p_this, const char *psz_file ) int i_steps = 0; /* to be sure to avoid multiple creation */ - var_Create( p_this->p_libvlc_global, "osd_mutex", VLC_VAR_MUTEX ); - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Create( p_this->p_libvlc, "osd_mutex", VLC_VAR_MUTEX ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); if( ( p_osd = vlc_object_find( p_this, VLC_OBJECT_OSDMENU, FIND_ANYWHERE ) ) == NULL ) @@ -124,7 +124,7 @@ void __osd_MenuDelete( vlc_object_t *p_this, osd_menu_t *p_osd ) if( !p_osd || !p_this ) return; - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); vlc_object_release( p_osd ); @@ -204,7 +204,7 @@ void __osd_MenuShow( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); #if defined(OSD_MENU_DEBUG) @@ -245,7 +245,7 @@ void __osd_MenuHide( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); #if defined(OSD_MENU_DEBUG) @@ -278,7 +278,7 @@ void __osd_MenuActivate( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); #if defined(OSD_MENU_DEBUG) @@ -340,7 +340,7 @@ void __osd_MenuNext( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_button = p_osd->p_state->p_visible; @@ -390,7 +390,7 @@ void __osd_MenuPrev( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_button = p_osd->p_state->p_visible; @@ -443,7 +443,7 @@ void __osd_MenuUp( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_button = p_osd->p_state->p_visible; @@ -514,7 +514,7 @@ void __osd_MenuDown( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_button = p_osd->p_state->p_visible; @@ -593,7 +593,7 @@ void __osd_Volume( vlc_object_t *p_this ) return; } - var_Get( p_this->p_libvlc_global, "osd_mutex", &lockval ); + var_Get( p_this->p_libvlc, "osd_mutex", &lockval ); vlc_mutex_lock( lockval.p_address ); p_button = p_osd->p_state->p_volume; -- 2.39.2