Mercurial > audlegacy

changeset 3979:67f01143e613

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improve on-demand probing: - playlist which contains subtunes is loaded properly. - custom uri is handled properly. - playlist_load_ins_file_tuple() has been rewritten. (necessary to subtune fix.) - playlist_load_ins_file() became wrapper function of playlist_load_ins_file_tuple(). - __playlist_ins_with_info() has been removed.
author Yoshiki Yazawa <yaz@cc.rim.or.jp>
date Wed, 21 Nov 2007 00:46:54 +0900
parents 40db2fe8d073
children bf0471c64f6a
files src/audacious/input.c src/audacious/playlist.c
diffstat 2 files changed, 94 insertions(+), 199 deletions(-) [+]
line wrap: on
line diff
--- a/src/audacious/input.c	Mon Nov 19 23:22:21 2007 +0100
+++ b/src/audacious/input.c	Wed Nov 21 00:46:54 2007 +0900
@@ -321,6 +321,7 @@
 
     /* some input plugins provide probe_for_tuple() only. */
     if ( (ip->probe_for_tuple && !ip->is_our_file_from_vfs && !ip->is_our_file) ||
+         (ip->probe_for_tuple && ip->have_subtune == TRUE) ||
          (ip->probe_for_tuple && (cfg.use_pl_metadata && (!loading || (loading && cfg.get_info_on_load)))) ) {
 
         Tuple *tuple = ip->probe_for_tuple(filename_proxy, fd);
@@ -418,27 +419,24 @@
     GList **list_hdr = NULL;
     extern GHashTable *ext_hash;
 
-    filename_proxy = g_strdup(filename);
-
-
     /* Some URIs will end in ?<subsong> to determine the subsong requested. */
     tmp_uri = g_strdup(filename);
     tmp = strrchr(tmp_uri, '?');
 
-    if (tmp != NULL && g_ascii_isdigit(*(tmp + 1)))
+    if (tmp && g_ascii_isdigit(*(tmp + 1)))
         *tmp = '\0';
 
+    filename_proxy = g_strdup(tmp_uri);
+    g_free(tmp_uri);
 
     /* Check for plugins with custom URI:// strings */
     /* cue:// cdda:// tone:// tact:// */
-    if ((ip = uri_get_plugin(filename)) != NULL && ip->enabled)
-    {
+    if ((ip = uri_get_plugin(filename_proxy)) != NULL && ip->enabled) {
         if (ip->is_our_file != NULL)
             ret = ip->is_our_file(filename_proxy);
         else
             ret = 0;
-        if (ret > 0)
-        {
+        if (ret > 0) {
             g_free(filename_proxy);
             pr = g_new0(ProbeResult, 1);
             pr->ip = ip;
@@ -450,8 +448,7 @@
 
 
     // open the file with vfs sub-system
-    fd = vfs_buffered_file_new_from_uri(tmp_uri);
-    g_free(tmp_uri);
+    fd = vfs_buffered_file_new_from_uri(filename_proxy);
 
     if (!fd) {
         printf("Unable to read from %s, giving up.\n", filename_proxy);
@@ -481,8 +478,8 @@
     // apply ext_hash check
     if(cfg.use_extension_probing) {
         use_ext_filter =
-            (fd != NULL && (!g_strncasecmp(filename, "/", 1) ||
-                            !g_strncasecmp(filename, "file://", 7))) ? TRUE : FALSE;
+            (fd && (!g_strncasecmp(filename_proxy, "/", 1) ||
+                    !g_strncasecmp(filename_proxy, "file://", 7))) ? TRUE : FALSE;
     }
 
     if(use_ext_filter) {
--- a/src/audacious/playlist.c	Mon Nov 19 23:22:21 2007 +0100
+++ b/src/audacious/playlist.c	Wed Nov 21 00:46:54 2007 +0900
@@ -149,6 +149,7 @@
 #define EXT_TRUE    1
 #define EXT_FALSE   0
 #define EXT_HAVE_SUBTUNE    2
+#define EXT_CUSTOM  3
 
 static gint filter_by_extension(const gchar *filename);
 static gboolean is_http(const gchar *filename);
@@ -655,29 +656,6 @@
 }
 
 static void
-__playlist_ins_with_info(Playlist * playlist,
-                         const gchar * filename,
-                         gint pos,
-                         const gchar * title,
-                         gint len,
-                         InputPlugin * dec)
-{
-    g_return_if_fail(filename != NULL);
-
-    PLAYLIST_LOCK(playlist);
-    playlist->entries = g_list_insert(playlist->entries,
-                             playlist_entry_new(filename, title, len, dec),
-                             pos);
-    PLAYLIST_UNLOCK(playlist);
-
-    g_mutex_lock(mutex_scan);
-    playlist_get_info_scan_active = TRUE;
-    g_mutex_unlock(mutex_scan);
-    g_cond_signal(cond_scan);
-    PLAYLIST_INCR_SERIAL(playlist);
-}
-
-static void
 __playlist_ins_with_info_tuple(Playlist * playlist,
 			       const gchar * filename,
 			       gint pos,
@@ -802,7 +780,7 @@
     }
 
     /* local file and on-demand probing is on */
-    else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
+    else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE && ext_flag != EXT_CUSTOM) {
         dec = NULL;
         if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
             return FALSE;
@@ -990,7 +968,7 @@
             g_free(filename);
             list = g_list_concat(list, sub);
         }
-        else if (cfg.playlist_detect && ext_flag != EXT_HAVE_SUBTUNE) { /* local file, no probing, no subtune */
+        else if (cfg.playlist_detect && ext_flag != EXT_HAVE_SUBTUNE && ext_flag != EXT_CUSTOM) { /* local file, no probing, no subtune */
             if(cfg.use_extension_probing) {
                 if(ext_flag == EXT_TRUE)
                     list = g_list_prepend(list, filename);
@@ -1734,109 +1712,27 @@
                        const gchar * playlist_name, gint pos,
                        const gchar * title, gint len)
 {
-    gchar *filename;
-    gchar *tmp, *path;
-    ProbeResult *pr = NULL;
-
-    g_return_if_fail(filename_p != NULL);
-    g_return_if_fail(playlist != NULL);
-    g_return_if_fail(playlist_name != NULL);
-
-    filename = g_strchug(g_strdup(filename_p));
-
-    if (cfg.convert_slash)
-        while ((tmp = strchr(filename, '\\')) != NULL)
-            *tmp = '/';
-
-    if (filename[0] != '/' && !strstr(filename, "://")) {
-        path = g_strdup(playlist_name);
-
-        if ((tmp = strrchr(path, '/')))
-            *tmp = '\0';
-        else {
-            gint ext_flag = filter_by_extension(filename);
-            gboolean http_flag = is_http(filename);
-
-            /* playlist file or remote uri */
-            if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-                pr = NULL;
-            }
-            /* local file and on-demand probing is on */
-            else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
-                pr = NULL;
-                if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
-                    return;
-            }
-            /* find decorder for local file */
-            else {
-                pr = input_check_file(filename, TRUE);
-            }
-
-            __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL);
-            g_free(pr);
-            return;
-        }
-
-        tmp = g_build_filename(path, filename, NULL);
-        gint ext_flag = filter_by_extension(tmp);
-        gboolean http_flag = is_http(tmp);
-
-        /* playlist file or remote uri */
-        if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-            pr = NULL;
-        }
-        /* local file and no probing, no subtune */
-        else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
-            pr = NULL;
-            if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
-                return;
-        }
-        /* find decoder for local file */
-        else {
-            pr = input_check_file(tmp, TRUE);
-        }
-
-        __playlist_ins_with_info(playlist, tmp, pos, title, len, pr ? pr->ip : NULL);
-        g_free(tmp);
-        g_free(path);
-        g_free(pr);
-    }
-    else {
-        gint ext_flag = filter_by_extension(filename);
-        gboolean http_flag = is_http(filename);
-
-        /* playlist file or remote uri */
-        if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-            pr = NULL;
-        }
-        /* local file and on-demand probing is on */
-        else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
-            pr = NULL;
-            if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
-                return;
-        }
-        /* find decoder for local file */
-        else {
-            pr = input_check_file(filename, TRUE);
-        }
-        __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL);
-        g_free(pr);
-    }
-
-    g_free(filename);
+    Tuple *tuple = tuple_new();
+
+    tuple_associate_string(tuple, FIELD_TITLE, NULL, title);
+    tuple_associate_int(tuple, FIELD_LENGTH, NULL, len);
+    tuple_associate_int(tuple, FIELD_MTIME, NULL, -1); // invalidate to make tuple renew
+
+    playlist_load_ins_file_tuple(playlist, filename_p, playlist_name, pos, tuple);
 }
 
-
 void
 playlist_load_ins_file_tuple(Playlist * playlist,
-			     const gchar * filename_p,
-			     const gchar * playlist_name, 
-			     gint pos,
-			     Tuple *tuple)
+                             const gchar * filename_p,      //filename to add
+                             const gchar * playlist_name,   //path of playlist file itself
+                             gint pos,
+                             Tuple *tuple)
 {
     gchar *filename;
     gchar *tmp, *path;
     ProbeResult *pr = NULL;		/* for decoder cache */
+    gchar *uri = NULL;
+
 
     g_return_if_fail(filename_p != NULL);
     g_return_if_fail(playlist_name != NULL);
@@ -1844,76 +1740,61 @@
 
     filename = g_strchug(g_strdup(filename_p));
 
+
+    /* convert backslash to slash */
     if (cfg.convert_slash)
         while ((tmp = strchr(filename, '\\')) != NULL)
             *tmp = '/';
 
-    if (filename[0] != '/' && !strstr(filename, "://")) {
-        path = g_strdup(playlist_name);
-        if ((tmp = strrchr(path, '/')))
-            *tmp = '\0';
-        else {
-            gint ext_flag = filter_by_extension(filename);
-            gboolean http_flag = is_http(filename);
-
-            if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-                pr = NULL;
-            }
-            else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
-                pr = NULL;
-                if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
-                    return;
-            }
-            else {
-                pr = input_check_file(filename, TRUE);
-            }
-
-            __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL);
-            g_free(pr);
-            return;
-        }
-
-        tmp = g_build_filename(path, filename, NULL);
-        gint ext_flag = filter_by_extension(tmp);
-        gboolean http_flag = is_http(tmp);
-
-        if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-            pr = NULL;
+
+    /* make full path uri here */
+    // case 1: filename is raw full path or uri
+    if (filename[0] == '/' || strstr(filename, "://")) {
+        uri = g_filename_to_uri(filename, NULL, NULL);
+        if(!uri) {
+            uri = g_strdup(filename);
         }
-        else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
-            pr = NULL;
-            if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
-                return;
-        }
-        else {
-            pr = input_check_file(filename, TRUE);
-        }
-
-        __playlist_ins_with_info_tuple(playlist, tmp, pos, tuple, pr ? pr->ip : NULL);
-        g_free(tmp);
-        g_free(path);
-        g_free(pr);
+        g_free(filename);
     }
+    // case 2: filename is not raw full path nor uri, playlist path is full path
+    // make full path by replacing last part of playlist path with filename. (using g_build_filename)
+    else if (playlist_name[0] == '/' || strstr(playlist_name, "://")) {
+        path = g_strdup(playlist_name);
+        tmp = strrchr(path, '/'); *tmp = '\0';
+        tmp = g_build_filename(path, filename, NULL);
+        uri = g_filename_to_uri(tmp, NULL, NULL);
+        g_free(tmp); g_free(filename);
+    }
+    // case 3: filename is not raw full path nor uri, playlist path is not full path
+    // just abort.
     else {
-        if (playlist->loading_playlist == TRUE ||
-            str_has_prefix_nocase(filename, "http://") ||
-            str_has_prefix_nocase(filename, "https://")) {
-            pr = NULL;
-        }
-        else if (cfg.playlist_detect == TRUE) {
-            pr = NULL;
-            if(cfg.use_extension_probing && !filter_by_extension(filename))
-                return;
-        }
-        else {
-            pr = input_check_file(filename, TRUE);
-        }
-
-        __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL);
-        g_free(pr);
+        g_free(filename);
+        return;
+    }
+
+
+    /* apply pre check and add to playlist */
+    gint ext_flag = filter_by_extension(uri);
+    gboolean http_flag = is_http(uri);
+
+    /* playlist file or remote uri */
+    if ((playlist->loading_playlist == TRUE && ext_flag != EXT_HAVE_SUBTUNE ) || http_flag == TRUE) {
+        pr = NULL;
     }
-
-    g_free(filename);
+    /* local file and on-demand probing is on */
+    else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE && ext_flag != EXT_CUSTOM) {
+        pr = NULL;
+        if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
+            return;
+    }
+    /* find decorder for local file */
+    else {
+        pr = input_check_file(uri, TRUE);
+    }
+
+    __playlist_ins_with_info_tuple(playlist, uri, pos, tuple, pr ? pr->ip : NULL);
+    g_free(pr);
+
 }
 
 static guint
@@ -3512,14 +3393,31 @@
 static gint
 filter_by_extension(const gchar *uri)
 {
-    gchar *base, *ext, *lext, *filename;
-    gchar *tmp = g_filename_from_uri(uri, NULL, NULL);
+    gchar *base, *ext, *lext, *filename, *tmp_uri;
+    gchar *tmp;
     gint rv;
     GList **lhandle, *node;
     InputPlugin *ip;
-
-    filename = g_strdup(tmp ? tmp : uri);
-    g_free(tmp);
+    
+    /* Some URIs will end in ?<subsong> to determine the subsong requested. */
+    tmp_uri = g_strdup(uri);
+    tmp = strrchr(tmp_uri, '?');
+
+    if (tmp != NULL && g_ascii_isdigit(*(tmp + 1)))
+        *tmp = '\0';
+
+    /* Check for plugins with custom URI:// strings */
+    /* cue:// cdda:// tone:// tact:// */
+    if ((ip = uri_get_plugin(tmp_uri)) != NULL && ip->enabled) {
+        g_free(tmp_uri);
+        return EXT_CUSTOM;
+    }
+    
+    tmp = g_filename_from_uri(tmp_uri, NULL, NULL);
+    filename = g_strdup(tmp ? tmp : tmp_uri);
+    g_free(tmp); tmp = NULL;
+    g_free(tmp_uri); tmp_uri = NULL;
+
 
     base = g_path_get_basename(filename);
     ext = strrchr(base, '.');