[vlc-devel] [PATCH] lib: Remove unused instance lock

Hugo Beauzée-Luyssen hugo at beauzee.fr
Thu Jun 11 14:42:32 CEST 2020


---
 lib/core.c            | 1 -
 lib/dialog.c          | 2 --
 lib/libvlc_internal.h | 1 -
 3 files changed, 4 deletions(-)

diff --git a/lib/core.c b/lib/core.c
index 8a998e3095..3bd3292e24 100644
--- a/lib/core.c
+++ b/lib/core.c
@@ -62,7 +62,6 @@ libvlc_instance_t * libvlc_new( int argc, const char *const *argv )
     p_new->p_libvlc_int = p_libvlc_int;
     vlc_atomic_rc_init( &p_new->ref_count );
     p_new->p_callback_list = NULL;
-    vlc_mutex_init(&p_new->instance_lock);
     return p_new;
 
 error:
diff --git a/lib/dialog.c b/lib/dialog.c
index 2fd936b2e4..5669bf8b4e 100644
--- a/lib/dialog.c
+++ b/lib/dialog.c
@@ -121,7 +121,6 @@ libvlc_dialog_set_callbacks(libvlc_instance_t *p_instance,
 {
     libvlc_int_t *p_libvlc = p_instance->p_libvlc_int;
 
-    vlc_mutex_lock(&p_instance->instance_lock);
     if (p_cbs != NULL)
     {
         const vlc_dialog_cbs dialog_cbs = {
@@ -145,7 +144,6 @@ libvlc_dialog_set_callbacks(libvlc_instance_t *p_instance,
     }
     else
         vlc_dialog_provider_set_callbacks(p_libvlc, NULL, NULL);
-    vlc_mutex_unlock(&p_instance->instance_lock);
 }
 
 void
diff --git a/lib/libvlc_internal.h b/lib/libvlc_internal.h
index 6c8ff49a81..154780895f 100644
--- a/lib/libvlc_internal.h
+++ b/lib/libvlc_internal.h
@@ -62,7 +62,6 @@ struct libvlc_instance_t
 {
     libvlc_int_t *p_libvlc_int;
     vlc_atomic_rc_t ref_count;
-    vlc_mutex_t   instance_lock;
     struct libvlc_callback_entry_list_t *p_callback_list;
     struct
     {
-- 
2.20.1



More information about the vlc-devel mailing list