comparison src/audacious/playlist.c @ 3780:ec989c2cde74

Make selective subtunes support actually work.

3779:7f42752acf4d

			       Tuple *tuple,
			       InputPlugin * dec)
{
    PlaylistEntry *entry;
    Tuple *parent_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) {
        nsubtunes = tuple->nsubtunes;
        if (nsubtunes > 0) {
            parent_tuple = tuple;
            i = 1;
        }
    }

    for (; add_flag && i <= nsubtunes; i++) {
        gchar *filename_entry;
        
        if (nsubtunes > 0) {
            filename_entry = g_strdup_printf("%s?%d", filename,
                parent_tuple->subtunes ? parent_tuple->subtunes[i] : i);
            
            /* We're dealing with subtune, let's ask again tuple information
             * to plugin, by passing the ?subtune suffix; this way we get
             * specific subtune information in the tuple, if available.
             */

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

        PLAYLIST_LOCK(playlist);

        if ((pos == -1) && (i < 2)) { // the common case
            GList *element;
            element = g_list_alloc();
            element->data = entry;
            element->prev = playlist->tail; // NULL is allowed here.
            element->next = NULL;

3780:ec989c2cde74

			       Tuple *tuple,
			       InputPlugin * dec)
{
    PlaylistEntry *entry;
    Tuple *parent_tuple = NULL;
    gint nsubtunes, subtune;
    gboolean add_flag = TRUE;

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

    if (tuple != NULL) {
        nsubtunes = tuple->nsubtunes;
        if (nsubtunes > 0)
            parent_tuple = tuple;
    } else
        nsubtunes = 0;

    for (subtune = 0; add_flag && subtune < nsubtunes; subtune++) {
        gchar *filename_entry;
        
        if (nsubtunes > 0) {
            filename_entry = g_strdup_printf("%s?%d", filename,
                parent_tuple->subtunes ? parent_tuple->subtunes[subtune] : subtune + 1);
            
            /* We're dealing with subtune, let's ask again tuple information
             * to plugin, by passing the ?subtune suffix; this way we get
             * specific subtune information in the tuple, if available.
             */

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

        PLAYLIST_LOCK(playlist);

        if (pos == -1 && subtune < 1 && nsubtunes < 1) { // the common case
            GList *element;
            element = g_list_alloc();
            element->data = entry;
            element->prev = playlist->tail; // NULL is allowed here.
            element->next = NULL;