[xine-cvs] CVS: gnome-xine/src playlist.c,1.83,1.84

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

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

Modified Files:
	playlist.c 
Log Message:
Unbreak playlist loading.
Make playlist format-specific loaders return -1 on error.
(FALSE (0) could be a valid playlist entry number.)


Index: playlist.c
===================================================================
RCS file: /cvsroot/xine/gnome-xine/src/playlist.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -r1.83 -r1.84
--- playlist.c	16 Nov 2004 00:00:37 -0000	1.83
+++ playlist.c	16 Nov 2004 23:17:05 -0000	1.84
@@ -464,7 +464,7 @@
   first = -1;
 
   if (! (contents = read_entire_file (mrl, &size)) )
-    return FALSE;
+    return -1;
 
   lines = g_strsplit (contents, "\n", 0);
   g_free (contents);
@@ -509,7 +509,7 @@
   first = -1;
 
   if (! (contents = read_entire_file (mrl, &size)) )
-    return FALSE;
+    return -1;
 
   lines = g_strsplit (contents, "\n", 0);
   g_free (contents);
@@ -697,7 +697,7 @@
   }
     
   if (! (contents_ptr = read_entire_file (mrl, &size)) )
-    return FALSE;
+    return -1;
 
   lines = g_strsplit (contents_ptr, "\n", 0);
   g_free (contents_ptr);
@@ -760,11 +760,11 @@
     }
 
     if (! (contents = http_download (mrl, &size)))
-      return FALSE;
+      return -1;
   } else {
 
     if (! (contents = read_entire_file (mrl, &size)) )
-      return FALSE;
+      return -1;
   }
 
   lines = g_strsplit (contents, "\n", 0);
@@ -1022,7 +1022,7 @@
       return playlist_load_smil (mrl, ins_pos);
   }
 
-  return 0;
+  return -2; /* not recognised */
 }
 
 static int playlist_add_mrl_internal (const char *mrl, gint ins_pos)
@@ -1038,7 +1038,7 @@
 
     /* is it a playlist file? */
     ret = playlist_add_playlist_mrl (mrl, ins_pos);
-    if (ret)
+    if (ret != -2)
       return ret;
 
     if (!strncasecmp (mrl, "cdda:", 5))
@@ -1077,7 +1077,7 @@
 
     /* is it a playlist file? */
     ret = playlist_add_playlist_mrl (mrl, ins_pos);
-    if (ret)
+    if (ret != -2)
       return ret;
 
     return playlist_add_int (mrl, ins_pos);