comparison src/audlegacy/playlist.c @ 4871:985cd1e770df

Fix a crash when deleting a playlist.

4870:56af01cd5a5c

    if (active) playlist_select_next();

    /* upon removal, a playlist should be cleared and freed */
    playlists = g_list_remove(playlists, playlist);
    playlist_clear(playlist);
    playlist_free(playlist);

    if (playlists_iter == NULL)
        playlists_iter = playlists;

    const DeviceInode *da = a, *db = b;
    return (da->dev == db->dev && da->ino == db->ino);
}

static gboolean
devino_destroy(gpointer key, 
               gpointer value,
               gpointer data)
{
    g_free(key);
    return TRUE;

playlist_add(Playlist * playlist, const gchar * filename)
{
    return playlist_ins(playlist, filename, -1);
}

guint 
playlist_add_dir(Playlist * playlist, const gchar * directory)
{
    return playlist_ins_dir(playlist, directory, -1, TRUE);
}

    GList *plist_pos_list;

    if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)
        ip_data.stop = TRUE;
    playback_stop();
    if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)  
        ip_data.stop = FALSE;

    hook_call("playback end", playlist->position);

    PLAYLIST_LOCK(playlist);

        mtime = tuple_get_int(tuple, FIELD_MTIME, NULL);
    else
        mtime = 0;

    // if no tuple or tuple with old mtime, get new one.
    if (tuple == NULL || 
        (entry->tuple && mtime != 0 && (mtime == -1 || mtime != playlist_get_mtime(entry->filename))))
    {
        playlist_entry_get_info(entry);
        tuple = entry->tuple;
    }

                {
                    update_playlistwin = TRUE;
                    continue;
                }

                if (!playlist_entry_get_info(entry) && 
                    g_list_index(playlist->entries, entry) == -1)
                    /* Entry disappeared while we looked it up.
                       Restart. */
                    node = playlist->entries;
                else if ((entry->tuple != NULL) ||
			 (entry->title != NULL && 
                         tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1))
                {
                    update_playlistwin = TRUE;
                    break; /* hmmm... --asphyx */

    g_static_rw_lock_writer_lock(&playlist_get_info_rwlock);
    if (!playlist_get_info_going) {
        g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock);
        return;
    }
    
    playlist_get_info_going = FALSE;
    g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock);

    g_cond_broadcast(cond_scan);
    g_thread_join(playlist_get_info_thread);

        if (!g_str_has_prefix(entry->filename, "file://"))
            continue;

        /* FIXME: Should test for readability */
        if (vfs_file_test(entry->filename, G_FILE_TEST_EXISTS))  
            continue;

        if (entry == playlist->position) {
            /* Don't remove the currently playing song */
            if (playback_get_playing())

4871:985cd1e770df

    if (active) playlist_select_next();

    /* upon removal, a playlist should be cleared and freed */
    playlists = g_list_remove(playlists, playlist);
    playlist_clear_only (playlist);
    playlist_free(playlist);

    if (playlists_iter == NULL)
        playlists_iter = playlists;

    const DeviceInode *da = a, *db = b;
    return (da->dev == db->dev && da->ino == db->ino);
}

static gboolean
devino_destroy(gpointer key,
               gpointer value,
               gpointer data)
{
    g_free(key);
    return TRUE;

playlist_add(Playlist * playlist, const gchar * filename)
{
    return playlist_ins(playlist, filename, -1);
}

guint
playlist_add_dir(Playlist * playlist, const gchar * directory)
{
    return playlist_ins_dir(playlist, directory, -1, TRUE);
}

    GList *plist_pos_list;

    if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)
        ip_data.stop = TRUE;
    playback_stop();
    if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong)
        ip_data.stop = FALSE;

    hook_call("playback end", playlist->position);

    PLAYLIST_LOCK(playlist);

        mtime = tuple_get_int(tuple, FIELD_MTIME, NULL);
    else
        mtime = 0;

    // if no tuple or tuple with old mtime, get new one.
    if (tuple == NULL ||
        (entry->tuple && mtime != 0 && (mtime == -1 || mtime != playlist_get_mtime(entry->filename))))
    {
        playlist_entry_get_info(entry);
        tuple = entry->tuple;
    }

                {
                    update_playlistwin = TRUE;
                    continue;
                }

                if (!playlist_entry_get_info(entry) &&
                    g_list_index(playlist->entries, entry) == -1)
                    /* Entry disappeared while we looked it up.
                       Restart. */
                    node = playlist->entries;
                else if ((entry->tuple != NULL) ||
			 (entry->title != NULL &&
                         tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                         tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1))
                {
                    update_playlistwin = TRUE;
                    break; /* hmmm... --asphyx */

    g_static_rw_lock_writer_lock(&playlist_get_info_rwlock);
    if (!playlist_get_info_going) {
        g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock);
        return;
    }

    playlist_get_info_going = FALSE;
    g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock);

    g_cond_broadcast(cond_scan);
    g_thread_join(playlist_get_info_thread);

        if (!g_str_has_prefix(entry->filename, "file://"))
            continue;

        /* FIXME: Should test for readability */
        if (vfs_file_test(entry->filename, G_FILE_TEST_EXISTS))
            continue;

        if (entry == playlist->position) {
            /* Don't remove the currently playing song */
            if (playback_get_playing())