audlegacy: src/audacious/playlist.c comparison

comparison src/audacious/playlist.c @ 3971:b0ae5dbd2f53

- add subtune support to on demand probing. - add new boolean member "have_subtune" to InputPlugin structure. plugins which support subtune shall set this.

author	Yoshiki Yazawa <yaz@cc.rim.or.jp>
date	Sun, 18 Nov 2007 21:39:28 +0900
parents	efd7ec36483e
children	67f01143e613

comparison

equal deleted inserted replaced

-:efd7ec36483e
+:b0ae5dbd2f53
 static void playlist_recalc_total_time_nolock(Playlist *);
 static void playlist_recalc_total_time(Playlist *);
 static gboolean playlist_entry_get_info(PlaylistEntry * entry);
-static gboolean filter_by_extension(const gchar *filename);
+#define EXT_TRUE    1
+#define EXT_FALSE   0
+#define EXT_HAVE_SUBTUNE    2
+static gint filter_by_extension(const gchar *filename);
+static gboolean is_http(const gchar *filename);
 static mowgli_heap_t *playlist_entry_heap = NULL;
 /* *********************** playlist entry code ********************** */
 gint r;
 VFSFile *file;
 ProbeResult *pr = NULL;
 InputPlugin *dec = NULL;
 Tuple *tuple = NULL;
+gint ext_flag;
+gboolean http_flag;
 g_return_val_if_fail(playlist != NULL, FALSE);
 g_return_val_if_fail(filename != NULL, FALSE);
 /* load playlist */
 playlist_load_ins(playlist, filename, pos);
 playlist->loading_playlist = FALSE;
 return TRUE;
 }
+ext_flag = filter_by_extension(filename);
+http_flag = is_http(filename);
 /* playlist file or remote uri */
-if (playlist->loading_playlist == TRUE ||
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-str_has_prefix_nocase(filename, "http://") ||
-str_has_prefix_nocase(filename, "https://")) {
 dec = NULL;
 }
 /* local file and on-demand probing is on */
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 dec = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
 return FALSE;
 }
 /* find decorder for local file */
 else {
 /* add filename to playlist */
 if (cfg.playlist_detect == TRUE ||
 playlist->loading_playlist == TRUE ||
 (playlist->loading_playlist == FALSE && dec != NULL) ||
-(playlist->loading_playlist == FALSE && !is_playlist_name(filename) &&
+(playlist->loading_playlist == FALSE && !is_playlist_name(filename) && http_flag) ) {
-str_has_prefix_nocase(filename, "http"))) {
 __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec);
 playlist_generate_shuffle_list(playlist);
 playlistwin_update_list(playlist);
 if (!(dir = g_dir_open(path, 0, NULL)))
 return NULL;
 while ((dir_entry = g_dir_read_name(dir))) {
 gchar *filename, *tmp;
+gint ext_flag;
+gboolean http_flag;
 if (file_is_hidden(dir_entry))
 continue;
 tmp = g_build_filename(path, dir_entry, NULL);
 filename = g_filename_to_uri(tmp, NULL, NULL);
 g_free(tmp);
+ext_flag = filter_by_extension(filename);
+http_flag = is_http(filename);
 if (vfs_file_test(filename, G_FILE_TEST_IS_DIR)) { /* directory */
 GList *sub;
 gchar *dirfilename = g_filename_from_uri(filename, NULL, NULL);
 sub = playlist_dir_find_files(dirfilename, background, htab);
 g_free(dirfilename);
 g_free(filename);
 list = g_list_concat(list, sub);
 }
-else if (cfg.playlist_detect) { /* local file, no probing */
+else if (cfg.playlist_detect && ext_flag != EXT_HAVE_SUBTUNE) { /* local file, no probing, no subtune */
 if(cfg.use_extension_probing) {
-if(filter_by_extension(filename))
+if(ext_flag == EXT_TRUE)
 list = g_list_prepend(list, filename);
 }
 else
 list = g_list_prepend(list, filename);
 }
-else if ((pr = input_check_file(filename, TRUE)) != NULL) /* local file, probing*/
+else if ((pr = input_check_file(filename, TRUE)) != NULL) /* local file, probing or have subtune */
 {
 list = g_list_prepend(list, filename);
 g_free(pr);
 pr = NULL;
 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 ||
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-str_has_prefix_nocase(filename, "http://") ||
-str_has_prefix_nocase(filename, "https://")) {
 pr = NULL;
 }
 /* local file and on-demand probing is on */
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 pr = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+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 ||
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-str_has_prefix_nocase(tmp, "http://") ||
-str_has_prefix_nocase(tmp, "https://")) {
 pr = NULL;
 }
-/* local file and on-demand probing is on */
+/* local file and no probing, no subtune */
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 pr = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+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
+else {
-{
+gint ext_flag = filter_by_extension(filename);
+gboolean http_flag = is_http(filename);
 /* playlist file or remote uri */
-if (playlist->loading_playlist == TRUE ||
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
-str_has_prefix_nocase(filename, "http://") ||
-str_has_prefix_nocase(filename, "https://")) {
 pr = NULL;
 }
 /* local file and on-demand probing is on */
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 pr = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
 return;
 }
 /* find decoder for local file */
 else {
 pr = input_check_file(filename, TRUE);
 g_free(pr);
 }
 g_free(filename);
 }
 void
 playlist_load_ins_file_tuple(Playlist * playlist,
 			     const gchar * filename_p,
 			     const gchar * playlist_name,
 if (filename[0] != '/' && !strstr(filename, "://")) {
 path = g_strdup(playlist_name);
 if ((tmp = strrchr(path, '/')))
 *tmp = '\0';
 else {
-if (playlist->loading_playlist == TRUE ||
+gint ext_flag = filter_by_extension(filename);
-str_has_prefix_nocase(filename, "http://") ||
+gboolean http_flag = is_http(filename);
-str_has_prefix_nocase(filename, "https://")) {
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
 pr = NULL;
 }
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 pr = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+if(cfg.use_extension_probing && ext_flag == EXT_FALSE)
 return;
 }
 else {
 pr = input_check_file(filename, TRUE);
 }
 g_free(pr);
 return;
 }
 tmp = g_build_filename(path, filename, NULL);
+gint ext_flag = filter_by_extension(tmp);
-if (playlist->loading_playlist == TRUE ||
+gboolean http_flag = is_http(tmp);
-str_has_prefix_nocase(filename, "http://") ||
-str_has_prefix_nocase(filename, "https://")) {
+if (playlist->loading_playlist == TRUE || http_flag == TRUE) {
 pr = NULL;
 }
-else if (cfg.playlist_detect == TRUE) {
+else if (cfg.playlist_detect == TRUE && ext_flag != EXT_HAVE_SUBTUNE) {
 pr = NULL;
-if(cfg.use_extension_probing && !filter_by_extension(filename))
+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);
 }
-else
+else {
-{
 if (playlist->loading_playlist == TRUE ||
 str_has_prefix_nocase(filename, "http://") ||
 str_has_prefix_nocase(filename, "https://")) {
 pr = NULL;
 }
 l2 = l2->next;
 } while(1);
 return TRUE;
 }
-static gboolean
+static gint
 filter_by_extension(const gchar *uri)
 {
 gchar *base, *ext, *lext, *filename;
 gchar *tmp = g_filename_from_uri(uri, NULL, NULL);
-gboolean rv;
+gint rv;
+GList **lhandle, *node;
+InputPlugin *ip;
 filename = g_strdup(tmp ? tmp : uri);
 g_free(tmp);
 base = g_path_get_basename(filename);
 ext = strrchr(base, '.');
 if(!ext) {
 g_free(base);
-return FALSE;
+return 0;
 }
 lext = g_ascii_strdown(ext+1, -1);
 g_free(base);
-if(g_hash_table_lookup(ext_hash, lext))
+lhandle = g_hash_table_lookup(ext_hash, lext);
+g_free(lext);
+if(!lhandle) {
+return EXT_FALSE;
+}
+for(node = *lhandle; node; node = g_list_next(node)) {
+ip = (InputPlugin *)node->data;
+if(ip->have_subtune == TRUE) {
+return EXT_HAVE_SUBTUNE;
+}
+else
+rv = EXT_TRUE;
+}
+return rv;
+}
+static gboolean
+is_http(const gchar *uri)
+{
+gboolean rv = FALSE;
+if(str_has_prefix_nocase(uri, "http://") ||
+str_has_prefix_nocase(uri, "https://")) {
 rv = TRUE;
-else
+}
-rv = FALSE;
-g_free(lext);
 return rv;
 }

Mercurial > audlegacy

comparison src/audacious/playlist.c @ 3971:b0ae5dbd2f53