comparison src/audacious/playlist.c @ 3127:c92070f10148 trunk

Use ProbeResult (try 1)

3126:ce5c6a5d64e2

static gboolean
playlist_entry_get_info(PlaylistEntry * entry)
{
    TitleInput *tuple;
    time_t modtime;

    g_return_val_if_fail(entry != NULL, FALSE);

    if (entry->tuple == NULL || entry->tuple->mtime > 0 || entry->tuple->mtime == -1)

        g_print("attempting to retrieve remote info not in background thread!\n");
        return FALSE;
    }

    if (entry->decoder == NULL)
        entry->decoder = input_check_file(entry->filename, FALSE);

    /* renew tuple if file mtime is newer than tuple mtime. */
    if(entry->tuple){
        if(entry->tuple->mtime == modtime)
            return TRUE;

            bmp_title_input_free(entry->tuple);
            entry->tuple = NULL;
        }
    }

    if (entry->decoder == NULL || entry->decoder->get_song_tuple == NULL)
        tuple = input_get_song_tuple(entry->filename);
    else
        tuple = entry->decoder->get_song_tuple(entry->filename);

    if (tuple == NULL)
        return FALSE;

    /* entry is still around */
    entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
    entry->length = tuple->length;
    entry->tuple = tuple;

    return TRUE;
}

/* *********************** playlist selector code ************************* */

playlist_ins(Playlist * playlist, const gchar * filename, gint pos)
{
    gchar buf[64], *p;
    gint r;
    VFSFile *file;
    InputPlugin *dec = NULL;

    g_return_val_if_fail(playlist != NULL, FALSE);
    g_return_val_if_fail(filename != NULL, FALSE);

    if (is_playlist_name(filename)) {

    if (playlist->loading_playlist == TRUE || cfg.playlist_detect == TRUE)
	dec = NULL;
    else if (!str_has_prefix_nocase(filename, "http://") && 
	     !str_has_prefix_nocase(filename, "https://"))
	dec = input_check_file(filename, TRUE);

    if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename) && str_has_prefix_nocase(filename, "http")))
    {
        __playlist_ins(playlist, filename, pos, dec);
        playlist_generate_shuffle_list(playlist);
        playlistwin_update_list(playlist);
        return TRUE;
    }

                        GHashTable * htab)
{
    GDir *dir;
    GList *list = NULL, *ilist;
    const gchar *dir_entry;

    struct stat statbuf;
    DeviceInode *devino;

    if (!path)

            g_free(filename);
            list = g_list_concat(list, sub);
        }
        else if (cfg.playlist_detect == TRUE)
            list = g_list_prepend(list, filename);
        else if (input_check_file(filename, TRUE))
            list = g_list_prepend(list, filename);
        else
            g_free(filename);

        while (background && gtk_events_pending())
            gtk_main_iteration();

                       const gchar * playlist_name, gint pos,
                       const gchar * title, gint len)
{
    gchar *filename;
    gchar *tmp, *path;
    InputPlugin *dec = NULL;		/* for decoder cache */

    g_return_if_fail(filename_p != NULL);
    g_return_if_fail(playlist != NULL);
    g_return_if_fail(playlist_name != NULL);

        if ((tmp = strrchr(path, '/')))
            *tmp = '\0';
        else {
	    if ((playlist->loading_playlist == TRUE ||
		cfg.playlist_detect == TRUE))
                dec = NULL;
	    else if (!str_has_prefix_nocase(filename, "http://") && 
	        !str_has_prefix_nocase(filename, "https://"))
		dec = input_check_file(filename, FALSE);

            __playlist_ins_with_info(playlist, filename, pos, title, len, dec);
            return;
        }
        tmp = g_build_filename(path, filename, NULL);

	if (playlist->loading_playlist == TRUE && cfg.playlist_detect == TRUE)
	    dec = NULL;
        else if (!str_has_prefix_nocase(tmp, "http://") && 
	    !str_has_prefix_nocase(tmp, "https://"))
	    dec = input_check_file(tmp, FALSE);

        __playlist_ins_with_info(playlist, tmp, pos, title, len, dec);
        g_free(tmp);
        g_free(path);
    }
    else
    {
        if ((playlist->loading_playlist == TRUE ||
  	    cfg.playlist_detect == TRUE))
            dec = NULL;
	else if (!str_has_prefix_nocase(filename, "http://") && 
	    !str_has_prefix_nocase(filename, "https://"))
	    dec = input_check_file(filename, FALSE);

        __playlist_ins_with_info(playlist, filename, pos, title, len, dec);
    }

    g_free(filename);
}

			     gint pos,
			     TitleInput *tuple)
{
    gchar *filename;
    gchar *tmp, *path;
    InputPlugin *dec = NULL;		/* for decoder cache */

    g_return_if_fail(filename_p != NULL);
    g_return_if_fail(playlist_name != NULL);
    g_return_if_fail(playlist != NULL);

        if ((tmp = strrchr(path, '/')))
            *tmp = '\0';
        else {
            if ((playlist->loading_playlist == TRUE ||
    	        cfg.playlist_detect == TRUE))
                dec = NULL;
	    else if (!str_has_prefix_nocase(filename, "http://") && 
	        !str_has_prefix_nocase(filename, "https://"))
	        dec = input_check_file(filename, FALSE);

            __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec);
            return;
        }
        tmp = g_build_filename(path, filename, NULL);

        if ((playlist->loading_playlist == TRUE ||
            cfg.playlist_detect == TRUE))
            dec = NULL;
        else if (!str_has_prefix_nocase(filename, "http://") && 
            !str_has_prefix_nocase(filename, "https://"))
            dec = input_check_file(filename, FALSE);

        __playlist_ins_with_info_tuple(playlist, tmp, pos, tuple, dec);
        g_free(tmp);
        g_free(path);
    }
    else
    {
        if ((playlist->loading_playlist == TRUE ||
            cfg.playlist_detect == TRUE))
            dec = NULL;
        else if (!str_has_prefix_nocase(filename, "http://") && 
            !str_has_prefix_nocase(filename, "https://"))
            dec = input_check_file(filename, FALSE);

        __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec);
    }

    g_free(filename);
}

{
    gchar *path = NULL;
    GList *node;
    PlaylistEntry *entry = NULL;
    TitleInput *tuple = NULL;

    PLAYLIST_LOCK(playlist->mutex);

    if ((node = g_list_nth(playlist->entries, pos)))
    {

    }

    if (tuple != NULL)
    {
        if (entry->decoder == NULL)
            entry->decoder = input_check_file(entry->filename, FALSE); /* try to find a decoder */

        if (entry->decoder != NULL && entry->decoder->file_info_box == NULL)
            fileinfo_show_for_tuple(tuple);
        else if (entry->decoder != NULL && entry->decoder->file_info_box != NULL)
            entry->decoder->file_info_box(path);

3127:c92070f10148

static gboolean
playlist_entry_get_info(PlaylistEntry * entry)
{
    TitleInput *tuple;
    ProbeResult *pr = NULL;
    time_t modtime;

    g_return_val_if_fail(entry != NULL, FALSE);

    if (entry->tuple == NULL || entry->tuple->mtime > 0 || entry->tuple->mtime == -1)

        g_print("attempting to retrieve remote info not in background thread!\n");
        return FALSE;
    }

    if (entry->decoder == NULL)
    {
        pr = input_check_file(entry->filename, FALSE);
        entry->decoder = pr->ip;
    }

    /* renew tuple if file mtime is newer than tuple mtime. */
    if(entry->tuple){
        if(entry->tuple->mtime == modtime)
            return TRUE;

            bmp_title_input_free(entry->tuple);
            entry->tuple = NULL;
        }
    }

    if (pr != NULL && pr->tuple != NULL)
        tuple = pr->tuple;
    else if (entry->decoder != NULL && entry->decoder->get_song_tuple != NULL)
        tuple = entry->decoder->get_song_tuple(entry->filename);

    if (tuple == NULL)
        return FALSE;

    /* entry is still around */
    entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
    entry->length = tuple->length;
    entry->tuple = tuple;

    g_free(pr);

    return TRUE;
}

/* *********************** playlist selector code ************************* */

playlist_ins(Playlist * playlist, const gchar * filename, gint pos)
{
    gchar buf[64], *p;
    gint r;
    VFSFile *file;
    ProbeResult *pr = NULL;
    InputPlugin *dec = NULL;
    TitleInput *tuple = NULL;

    g_return_val_if_fail(playlist != NULL, FALSE);
    g_return_val_if_fail(filename != NULL, FALSE);

    if (is_playlist_name(filename)) {

    if (playlist->loading_playlist == TRUE || cfg.playlist_detect == TRUE)
	dec = NULL;
    else if (!str_has_prefix_nocase(filename, "http://") && 
	     !str_has_prefix_nocase(filename, "https://"))
    {
        pr = input_check_file(filename, TRUE);

        if (pr)
        {
            dec = pr->ip;
            tuple = pr->tuple;
        }

        g_free(pr);
    }

    if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || (playlist->loading_playlist == FALSE && dec != NULL) || (playlist->loading_playlist == FALSE && !is_playlist_name(filename) && 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);
        return TRUE;
    }

                        GHashTable * htab)
{
    GDir *dir;
    GList *list = NULL, *ilist;
    const gchar *dir_entry;
    ProbeResult *pr = NULL;

    struct stat statbuf;
    DeviceInode *devino;

    if (!path)

            g_free(filename);
            list = g_list_concat(list, sub);
        }
        else if (cfg.playlist_detect == TRUE)
            list = g_list_prepend(list, filename);
        else if ((pr = input_check_file(filename, TRUE)) != NULL)
        {
            list = g_list_prepend(list, filename);

            g_free(pr);
            pr = NULL;
        }
        else
            g_free(filename);

        while (background && gtk_events_pending())
            gtk_main_iteration();

                       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);

        if ((tmp = strrchr(path, '/')))
            *tmp = '\0';
        else {
	    if ((playlist->loading_playlist == TRUE ||
		cfg.playlist_detect == TRUE))
                pr = NULL;
	    else if (!str_has_prefix_nocase(filename, "http://") && 
	        !str_has_prefix_nocase(filename, "https://"))
		pr = input_check_file(filename, FALSE);

            __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL);

            g_free(pr);
            return;
        }
        tmp = g_build_filename(path, filename, NULL);

	if (playlist->loading_playlist == TRUE && cfg.playlist_detect == TRUE)
	    pr = NULL;
        else if (!str_has_prefix_nocase(tmp, "http://") && 
	    !str_has_prefix_nocase(tmp, "https://"))
	    pr = input_check_file(tmp, FALSE);

        __playlist_ins_with_info(playlist, tmp, pos, title, len, dec, pr ? pr->ip : NULL);
        g_free(tmp);
        g_free(path);
        g_free(pr);
    }
    else
    {
        if ((playlist->loading_playlist == TRUE ||
  	    cfg.playlist_detect == TRUE))
            pr = NULL;
	else if (!str_has_prefix_nocase(filename, "http://") && 
	    !str_has_prefix_nocase(filename, "https://"))
	    pr = input_check_file(filename, FALSE);

        __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL);

        g_free(pr);
    }

    g_free(filename);
}

			     gint pos,
			     TitleInput *tuple)
{
    gchar *filename;
    gchar *tmp, *path;
    ProbeResult *pr = NULL;		/* for decoder cache */

    g_return_if_fail(filename_p != NULL);
    g_return_if_fail(playlist_name != NULL);
    g_return_if_fail(playlist != NULL);

        if ((tmp = strrchr(path, '/')))
            *tmp = '\0';
        else {
            if ((playlist->loading_playlist == TRUE ||
    	        cfg.playlist_detect == TRUE))
                pr = NULL;
	    else if (!str_has_prefix_nocase(filename, "http://") && 
	        !str_has_prefix_nocase(filename, "https://"))
	        pr = input_check_file(filename, FALSE);

            __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL);

            g_free(pr);
            return;
        }
        tmp = g_build_filename(path, filename, NULL);

        if ((playlist->loading_playlist == TRUE ||
            cfg.playlist_detect == TRUE))
            pr = NULL;
        else if (!str_has_prefix_nocase(filename, "http://") && 
            !str_has_prefix_nocase(filename, "https://"))
            pr = input_check_file(filename, FALSE);

        __playlist_ins_with_info_tuple(playlist, tmp, pos, tuple, pr ? pr->ip : NULL);
        g_free(tmp);
        g_free(path);
        g_free(pr);
    }
    else
    {
        if ((playlist->loading_playlist == TRUE ||
            cfg.playlist_detect == TRUE))
            pr = NULL;
        else if (!str_has_prefix_nocase(filename, "http://") && 
            !str_has_prefix_nocase(filename, "https://"))
            pr = input_check_file(filename, FALSE);

        __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL);
        g_free(pr);
    }

    g_free(filename);
}

{
    gchar *path = NULL;
    GList *node;
    PlaylistEntry *entry = NULL;
    TitleInput *tuple = NULL;
    ProbeResult *pr = NULL;

    PLAYLIST_LOCK(playlist->mutex);

    if ((node = g_list_nth(playlist->entries, pos)))
    {

    }

    if (tuple != NULL)
    {
        if (entry->decoder == NULL)
        {
            pr = input_check_file(entry->filename, FALSE); /* try to find a decoder */
            entry->decoder = pr ? pr->ip : NULL;

            g_free(pr);
        }

        if (entry->decoder != NULL && entry->decoder->file_info_box == NULL)
            fileinfo_show_for_tuple(tuple);
        else if (entry->decoder != NULL && entry->decoder->file_info_box != NULL)
            entry->decoder->file_info_box(path);