comparison src/audacious/playlist.c @ 3636:65b750891387

Possibly fix a lockup problem.

3635:b20e98407a30

			       InputPlugin * dec)
{
    PlaylistEntry *entry;
    Tuple *main_tuple = NULL;
    gint nsubtunes = 0, i = 0;

    g_return_if_fail(playlist != NULL);
    g_return_if_fail(filename != NULL);

    if (tuple != NULL) {

            main_tuple = tuple;
            i = 1;
        }
    }

    for (; i <= nsubtunes; i++) {
        gchar *filename_entry;
        
        if (nsubtunes > 0) {
            filename_entry = g_strdup_printf("%s?%d", filename, main_tuple->subtunes[i]);
            /* We're dealing with subtune, let's ask again tuple information

        entry = playlist_entry_new(filename_entry,
            tuple ? tuple_get_string(tuple, FIELD_TITLE, NULL) : NULL,
            tuple ? tuple_get_int(tuple, FIELD_LENGTH, NULL) : -1, dec);
        g_free(filename_entry);

        if(!playlist->tail)
            playlist->tail = g_list_last(playlist->entries);

        PLAYLIST_LOCK(playlist);

        if ((pos == -1) && (i < 2)) { // the common case

            if(!playlist->entries) { // this is the first element
                playlist->entries = element;
                playlist->tail = element;
            } else { // the rests
                g_return_if_fail(playlist->tail != NULL);
                playlist->tail->next = element;
                playlist->tail = element;
            }
        } else {
            playlist->entries = g_list_insert(playlist->entries, entry, pos);
        }

3636:65b750891387

			       InputPlugin * dec)
{
    PlaylistEntry *entry;
    Tuple *main_tuple = NULL;
    gint nsubtunes = 0, i = 0;
    gboolean add_flag = TRUE;

    g_return_if_fail(playlist != NULL);
    g_return_if_fail(filename != NULL);

    if (tuple != NULL) {

            main_tuple = tuple;
            i = 1;
        }
    }

    for (; add_flag && i <= nsubtunes; i++) {
        gchar *filename_entry;
        
        if (nsubtunes > 0) {
            filename_entry = g_strdup_printf("%s?%d", filename, main_tuple->subtunes[i]);
            /* We're dealing with subtune, let's ask again tuple information

        entry = playlist_entry_new(filename_entry,
            tuple ? tuple_get_string(tuple, FIELD_TITLE, NULL) : NULL,
            tuple ? tuple_get_int(tuple, FIELD_LENGTH, NULL) : -1, dec);
        g_free(filename_entry);

        if (!playlist->tail)
            playlist->tail = g_list_last(playlist->entries);

        PLAYLIST_LOCK(playlist);

        if ((pos == -1) && (i < 2)) { // the common case

            if(!playlist->entries) { // this is the first element
                playlist->entries = element;
                playlist->tail = element;
            } else { // the rests
                if (playlist->tail != NULL) {
                    playlist->tail->next = element;
                    playlist->tail = element;
                } else
                    add_flag = FALSE;
            }
        } else {
            playlist->entries = g_list_insert(playlist->entries, entry, pos);
        }