[vlc-devel] commit: PDA GTK: remove dummy locking ( Rémi Denis-Courmont )
git version control
git at videolan.org
Tue Mar 17 20:02:45 CET 2009
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Mar 17 20:54:01 2009 +0200| [5c291911bb2d14da60cfa3fa74cf1c081d42935a] | committer: Rémi Denis-Courmont
PDA GTK: remove dummy locking
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=5c291911bb2d14da60cfa3fa74cf1c081d42935a
---
modules/gui/pda/pda.c | 5 -----
modules/gui/pda/pda_callbacks.c | 6 ------
2 files changed, 0 insertions(+), 11 deletions(-)
diff --git a/modules/gui/pda/pda.c b/modules/gui/pda/pda.c
index 109cb18..6b7bb03 100644
--- a/modules/gui/pda/pda.c
+++ b/modules/gui/pda/pda.c
@@ -397,7 +397,6 @@ void GtkAutoPlayFile( vlc_object_t *p_this )
static int Manage( intf_thread_t *p_intf )
{
GtkListStore *p_liststore;
- vlc_mutex_lock( &p_intf->change_lock );
/* Update the input */
if( p_intf->p_sys->p_input == NULL )
@@ -522,8 +521,6 @@ static int Manage( intf_thread_t *p_intf )
#ifndef NEED_GTK2_MAIN
if( !vlc_object_alive( p_intf ) )
{
- vlc_mutex_unlock( &p_intf->change_lock );
-
/* Prepare to die, young Skywalker */
gtk_main_quit();
@@ -531,8 +528,6 @@ static int Manage( intf_thread_t *p_intf )
}
#endif
- vlc_mutex_unlock( &p_intf->change_lock );
-
return TRUE;
}
diff --git a/modules/gui/pda/pda_callbacks.c b/modules/gui/pda/pda_callbacks.c
index 0fb187a..a0ef658 100644
--- a/modules/gui/pda/pda_callbacks.c
+++ b/modules/gui/pda/pda_callbacks.c
@@ -346,9 +346,7 @@ gboolean onPDADeleteEvent(GtkWidget *widget, GdkEvent *event, gpointer user_data
{
intf_thread_t *p_intf = GtkGetIntf( widget );
- vlc_mutex_lock( &p_intf->change_lock );
libvlc_Quit( p_intf->p_libvlc );
- vlc_mutex_unlock( &p_intf->change_lock );
msg_Dbg( p_intf, "about to exit vlc ... signaled" );
return TRUE;
@@ -437,9 +435,7 @@ gboolean SliderRelease(GtkWidget *widget, GdkEventButton *event, gpointer user_d
intf_thread_t *p_intf = GtkGetIntf( widget );
msg_Dbg( p_intf, "SliderButton Release" );
- vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->b_slider_free = 1;
- vlc_mutex_unlock( &p_intf->change_lock );
return TRUE;
}
@@ -449,9 +445,7 @@ gboolean SliderPress(GtkWidget *widget, GdkEventButton *event, gpointer user_dat
intf_thread_t *p_intf = GtkGetIntf( widget );
msg_Dbg( p_intf, "SliderButton Press" );
- vlc_mutex_lock( &p_intf->change_lock );
p_intf->p_sys->b_slider_free = 0;
- vlc_mutex_unlock( &p_intf->change_lock );
return FALSE;
}
More information about the vlc-devel
mailing list