[xine-cvs] CVS: gnome-xine/src main.c,1.41,1.42 playlist.c,1.11,1.12

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/gnome-xine/src
In directory usw-pr-cvs1:/tmp/cvs-serv12577/src

Modified Files:
	main.c playlist.c 
Log Message:
more fixes

Index: main.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/main.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- main.c	26 Oct 2002 17:20:47 -0000	1.41
+++ main.c	26 Oct 2002 17:57:56 -0000	1.42
@@ -472,6 +472,9 @@
   gint pos_stream, pos_time, length_time;
   gfloat pos;
 
+  if (gtk_xine_get_status (GTK_XINE(gtx)) != XINE_STATUS_PLAY) 
+    return TRUE;
+
   gtk_xine_get_pos_length (GTK_XINE(gtx),
 			   &pos_stream, &pos_time, &length_time);
 
@@ -856,6 +859,8 @@
 
   playlist_init();
   settings_init();
+
+  gtk_main_iteration ();
 
   run_wizards (FALSE);
 

Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- playlist.c	26 Oct 2002 17:20:47 -0000	1.11
+++ playlist.c	26 Oct 2002 17:57:56 -0000	1.12
@@ -484,13 +484,11 @@
   char *strs[2];
   int    pos;
 
-  printf ("playlist: add >%s<\n", mrl);
-
   /*
    * is this mrl in fact a simple filename?
    */
 
-  if ( (mrl[0]!='/') && !strstr (mrl, "://") ) {
+  if ( !strstr (mrl, "://") ) {
 
     char *extension;
 
@@ -498,15 +496,15 @@
 
     extension = strrchr(mrl, '.');
 
-    if (!strncasecmp (extension, ".pls", 4)) {
+    if (extension && !strncasecmp (extension, ".pls", 4)) {
       
       return playlist_load_pls (mrl);
-
-    } else if (!strncasecmp (extension, ".asx", 4)) {
-
+      
+    } else if (extension && !strncasecmp (extension, ".asx", 4)) {
+      
       return playlist_load_asx (mrl);
 
-    } else {
+    } else if (mrl[0]!='/') {
 
       /* make filename an absolute pathname */
 
@@ -773,6 +771,3 @@
 
   }
 }
-
-
-