* modules/gui/gtk/gtk_callbacks.c: fixed deadlocks.

* modules/gui/gtk/gtk.c: fixed uninitialized variables.

diff --git a/modules/gui/gtk/gtk.c b/modules/gui/gtk/gtk.c
index 832db714923b4a78a9ac11e556ab8b716bbd738e..33e700cd96dcf50e2f6b366d0708b32dec40a667 100644 (file)
--- a/modules/gui/gtk/gtk.c
+++ b/modules/gui/gtk/gtk.c
@@ -2,7 +2,7 @@
  * gtk.c : Gtk+ plugin for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: gtk.c,v 1.7 2002/11/12 11:45:27 gbazin Exp $
+ * $Id: gtk.c,v 1.8 2002/11/12 16:02:51 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *
@@ -114,6 +114,11 @@ static int Open( vlc_object_t *p_this )
     p_intf->p_sys->b_popup_changed = 0;
     p_intf->p_sys->b_window_changed = 0;
     p_intf->p_sys->b_playlist_changed = 0;
+    p_intf->p_sys->b_program_update = 0;
+    p_intf->p_sys->b_title_update = 0;
+    p_intf->p_sys->b_chapter_update = 0;
+    p_intf->p_sys->b_spu_update = 0;
+    p_intf->p_sys->b_audio_update = 0;
 
     p_intf->p_sys->p_input = NULL;
     p_intf->p_sys->i_playing = -1;

diff --git a/modules/gui/gtk/gtk_callbacks.c b/modules/gui/gtk/gtk_callbacks.c
index 6d8c702aaee855d324fa50ca8d57996e1b7a532d..fe2793001e5eb22e82d3738575563b6fcbb571d3 100644 (file)
--- a/modules/gui/gtk/gtk_callbacks.c
+++ b/modules/gui/gtk/gtk_callbacks.c
@@ -2,7 +2,7 @@
  * gtk_callbacks.c : Callbacks for the Gtk+ plugin.
  *****************************************************************************
  * Copyright (C) 2000, 2001 VideoLAN
- * $Id: gtk_callbacks.c,v 1.4 2002/11/06 15:41:29 jobi Exp $
+ * $Id: gtk_callbacks.c,v 1.5 2002/11/12 16:02:51 gbazin Exp $
  *
  * Authors: Samuel Hocevar <sam@zoy.org>
  *          Stéphane Borel <stef@via.ecp.fr>
@@ -276,11 +276,11 @@ void GtkChapterPrev( GtkButton * button, gpointer user_data )
         p_area->i_part--;
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
         input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
- 
+
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );
 
         p_intf->p_sys->b_chapter_update = 1;
+        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
         GtkSetupMenus( p_intf );
     }
     vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
@@ -301,7 +301,6 @@ void GtkChapterNext( GtkButton * button, gpointer user_data )
         p_area->i_part++;
         vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
         input_ChangeArea( p_intf->p_sys->p_input, (input_area_t*)p_area );
-        vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
 
         input_SetStatus( p_intf->p_sys->p_input, INPUT_STATUS_PLAY );