[xine-cvs] CVS: gnome-xine/src player.c,1.69,1.70

[Darren S. <ds...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12110/src

Modified Files:
	player.c 
Log Message:
Rework (simplify) locking for MRL launching.

Index: player.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/player.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- player.c	21 Feb 2006 19:26:29 -0000	1.69
+++ player.c	21 Feb 2006 23:27:04 -0000	1.70
@@ -65,13 +65,13 @@
   xine_cfg_entry_t entry;
   char *mrl = NULL;
 
+  gdk_threads_enter();
   pthread_mutex_lock (&engine_lock);
 
-  gdk_threads_enter();
   gxineinfo_clear (infobars);
   gxineinfo_update_line (infobars, 0, "%s", _("opening..."));
   gxineinfo_update_line (infobars, 1, "%s", cur_mrl);
-  gdk_threads_leave();
+  /*gdk_threads_leave();*/
 
   if ((!xine_config_lookup_entry (xine, "gui.subtitle_autoload", &entry)
        || entry.num_value)
@@ -130,7 +130,7 @@
   if (!xine_open (stream, mrl ? : cur_mrl))
   {
     int error;
-    gdk_threads_enter();
+    /*gdk_threads_enter();*/
     switch (error = xine_get_error (stream)) {
     case XINE_ERROR_NO_INPUT_PLUGIN:
       display_error (FROM_XINE, _("The xine engine failed to start."),
@@ -155,21 +155,21 @@
     }
 
     g_idle_add ((GSourceFunc)playlist_logo, NULL);
-    gdk_threads_leave();
+    /*gdk_threads_leave();*/
     goto done;
   }
 
-  gdk_threads_enter();
+  /*gdk_threads_enter();*/
   ui_set_status (playlist_showing_logo () ? UI_STOP : UI_PLAY);
   infobar_show_metadata (infobars);
-  gdk_threads_leave();
+  /*gdk_threads_leave();*/
 
   xine_play (stream, goto_pos, goto_time);
   goto_pos = 0;
   goto_time = 0;
 
   /* correct for possible stream changes */
-  gdk_threads_enter();
+  /*gdk_threads_enter();*/
   ui_set_status (playlist_showing_logo () ? UI_STOP : UI_PLAY);
   infobar_show_metadata (infobars);
   playlist_check_set_title ();