[xine-cvs] CVS: gnome-xine/src main.c,1.136,1.137 ui.c,1.18,1.19 ui.h,1.7,1.8

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

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

Modified Files:
	main.c ui.c ui.h 
Log Message:
Delay application of slider settings until a stream is started.


Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -r1.136 -r1.137
--- main.c	17 Jul 2005 21:49:37 -0000	1.136
+++ main.c	31 Jul 2005 16:47:02 -0000	1.137
@@ -504,6 +504,7 @@
   if (fullscreen)
     engine_exec ("vo_fullscreen.v = true;", NULL, NULL, NULL);
 
+  g_idle_add ((GSourceFunc) ui_post_init, NULL);
   server_start ();
 
   gdk_threads_enter();

Index: ui.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/ui.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ui.c	14 Jul 2005 20:03:04 -0000	1.18
+++ ui.c	31 Jul 2005 16:47:02 -0000	1.19
@@ -215,11 +215,7 @@
     starts[item] = start;
 
     if (ranges[item].param)
-    {
       inits[item] = start = xine_get_param (stream, ranges[item].param);
-      if (item != Control_VOLUME)
-        xine_set_param (stream, ranges[item].param, start);
-    }
 
     c_adjustments[item] =
       gtk_adjustment_new (start, ranges[item].min, ranges[item].max + 1,
@@ -676,3 +672,13 @@
     }
   }
 }
+
+void ui_post_init (void)
+{
+  int i;
+  gdk_threads_enter ();
+  for (i = 0; i < G_N_ELEMENTS (ranges); ++i)
+    if (ranges[i].param && i != Control_VOLUME)
+      xine_set_param (stream, ranges[i].param, starts[i]);
+  gdk_threads_leave ();
+}

Index: ui.h
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/ui.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ui.h	13 Jul 2005 22:53:05 -0000	1.7
+++ ui.h	31 Jul 2005 16:47:02 -0000	1.8
@@ -133,5 +133,6 @@
 void window_check_vis (gboolean force);
 
 void ui_init (void);
+void ui_post_init (void);
 
 #endif