[xine-cvs] CVS: xine-ui/src/xitk download.c,1.10,1.11 mediamark.c,1.76,1.77

[Daniel Caujolle-B. <f1...@us...>]

Update of /cvsroot/xine/xine-ui/src/xitk
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25321

Modified Files:
	download.c mediamark.c 
Log Message:
support playlist downloading

Index: download.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/download.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- download.c	14 Feb 2004 12:09:13 -0000	1.10
+++ download.c	13 Apr 2004 07:30:14 -0000	1.11
@@ -52,10 +52,10 @@
   download_t  *download = (download_t *) userdata;
   char         buffer[1024];
   int          percent = (dltotal > 0.0) ? (int) (dlnow * 100.0 / dltotal) : 0;
-
+  
   osd_draw_bar(_("Download in progress"), 0, 100, percent, OSD_BAR_POS);
   memset(&buffer, 0, sizeof(buffer));
-  sprintf(buffer, _("Download progress: %d%%."), percent);
+  snprintf(buffer, sizeof(buffer), _("Download progress: %d%%."), percent);
   gGui->mrl_overrided = 3;
   panel_set_title(buffer);
   
@@ -88,7 +88,7 @@
 #ifdef HAVE_CURL
   CURL        *curl;
   CURLcode     res;
-  
+
   pthread_mutex_lock(&gGui->download_mutex);
 
   curl_global_init(CURL_GLOBAL_DEFAULT);

Index: mediamark.c
===================================================================
RCS file: /cvsroot/xine/xine-ui/src/xitk/mediamark.c,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- mediamark.c	9 Apr 2004 22:29:06 -0000	1.76
+++ mediamark.c	13 Apr 2004 07:30:14 -0000	1.77
@@ -129,7 +129,7 @@
   char        *buf = NULL;
   int          fd, bytes_read;
   char        *extension;
-  
+
   if((!filename) || (!strlen(filename))) {
     fprintf(stderr, "%s(): Empty or NULL filename.\n", __XINE_FUNCTION__);
     return NULL;
@@ -137,9 +137,11 @@
   
   extension = strrchr(filename, '.');
   if(extension && 
-     ((!strncasecmp(extension, ".asx", 4)) || (!strncasecmp(extension, ".xml", 4)) ||
-      (!strncasecmp(extension, ".smi", 4)) || (!strncasecmp(extension, ".smil", 5))) && 
-     ((!strncasecmp(filename, "http://", 7)) || (!strncasecmp(filename, "ftp://", 6))))
+     ((!strncasecmp(extension, ".pls", 4)) || (!strncasecmp(extension, ".m3u", 4)) || 
+      (!strncasecmp(extension, ".sfv", 4)) || (!strncasecmp(extension, ".tox", 4)) ||
+      (!strncasecmp(extension, ".asx", 4)) || (!strncasecmp(extension, ".smi", 4)) || 
+      (!strncasecmp(extension, ".smil", 5)) || (!strncasecmp(extension, ".xml", 4))) &&
+     is_downloadable((char *) filename)) 
     return _download_file(filename, size);
   
   if(stat(filename, &st) < 0) {
@@ -278,7 +280,7 @@
   char         *extension;
 
   if(filename) {
-    if(is_a_file((char *) filename)) {
+    if(is_a_file((char *) filename) || is_downloadable((char *) filename)) {
       
       extension = strrchr(filename, '.');
       
@@ -371,7 +373,7 @@
   mediamark_t **mmk = NULL;
   
   if(filename) {
-    if(is_a_file((char *) filename)) {
+    if(is_a_file((char *) filename) || is_downloadable((char *) filename)) {
       char *m3u_content;
       int   size;
       
@@ -477,7 +479,7 @@
   mediamark_t **mmk = NULL;
 
   if(filename) {
-    if(is_a_file((char *) filename)) {
+    if(is_a_file((char *) filename) || is_downloadable((char *) filename)) {
       char  *extension;
   
       extension = strrchr(filename, '.');
@@ -612,10 +614,10 @@
   mediamark_t **mmk = NULL;
 
   if(filename) {
-    if(is_a_file((char *) filename)) {
+    if(is_a_file((char *) filename) || is_downloadable((char *) filename)) {
       char *raw_content;
       int   size;
-      
+
       if((raw_content = _read_file(filename, &size)) != NULL) {
 	
 	playlist->data = raw_content;
@@ -693,7 +695,7 @@
   mediamark_t **mmk = NULL;
   
   if(filename) {
-    if(is_a_file((char *) filename)) {
+    if(is_a_file((char *) filename) || is_downloadable((char *) filename)) {
       int   entries_tox = 0;
       char *tox_content;
       int   size;