[xine-cvs] CVS: gnome-xine/src noskin_window.c,1.27.2.1,1.27.2.2 utils.c,1.27.2.1,1.27.2.2

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

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

Modified Files:
      Tag: gxine-0_4_0-branch
	noskin_window.c utils.c 
Log Message:
Fix a UI state display bug (logo display => stopped).


Index: noskin_window.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/noskin_window.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- noskin_window.c	23 Nov 2004 02:32:16 -0000	1.27.2.1
+++ noskin_window.c	26 Nov 2004 19:06:57 -0000	1.27.2.2
@@ -226,7 +226,7 @@
 void window_set_status (ui_status_t status)
 {
   char states[CONTROLS] = { 0 };
-  int live = player_live_stream ();
+  int live = player_live_stream () || playlist_showing_logo ();
   int i;
 
   switch (status)

Index: utils.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/utils.c,v
retrieving revision 1.27.2.1
retrieving revision 1.27.2.2
diff -u -r1.27.2.1 -r1.27.2.2
--- utils.c	21 Nov 2004 18:48:46 -0000	1.27.2.1
+++ utils.c	26 Nov 2004 19:06:57 -0000	1.27.2.2
@@ -460,13 +460,16 @@
   return name;
 }
 
-static ui_status_t status = UI_STOP;
+static ui_status_t status = UI_CURRENT_STATE;
 pthread_mutex_t status_lock = PTHREAD_MUTEX_INITIALIZER;
 
 void ui_set_status (ui_status_t newstatus)
 {
   pthread_mutex_lock (&status_lock);
 
+  if (playlist_showing_logo ())
+    newstatus = UI_STOP;
+
   switch (newstatus)
   {
   case UI_CURRENT_STATE: