comparison src/audacious/playlist.c @ 3778:b4fe7d2a0d0d

Use a more describing variable name.

3742:e7caa4d49d74

			       gint pos,
			       Tuple *tuple,
			       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) {
        nsubtunes = tuple->nsubtunes;
        if (nsubtunes > 0) {
            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 ? main_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.
             */

            entry->length = tuple_get_int(tuple, FIELD_LENGTH, NULL);
            entry->tuple = tuple;
        }
    }
    
    if (main_tuple)
        tuple_free(main_tuple);

    if (tuple != NULL && tuple_get_int(tuple, FIELD_MTIME, NULL) == -1) {
        // kick the scanner thread only if mtime = -1 (uninitialized)
        g_mutex_lock(mutex_scan);
        playlist_get_info_scan_active = TRUE;

3778:b4fe7d2a0d0d

			       gint pos,
			       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.
             */

            entry->length = tuple_get_int(tuple, FIELD_LENGTH, NULL);
            entry->tuple = tuple;
        }
    }
    
    if (parent_tuple)
        tuple_free(parent_tuple);

    if (tuple != NULL && tuple_get_int(tuple, FIELD_MTIME, NULL) == -1) {
        // kick the scanner thread only if mtime = -1 (uninitialized)
        g_mutex_lock(mutex_scan);
        playlist_get_info_scan_active = TRUE;