comparison audacious/playlist.c @ 2120:1d67cf383e32 trunk

[svn] - dynamically allocate the playlist at startup and fix some lingering improper uses of playlist_get()

2119:6d7381072a45

/* If we manually change the song, p_p_b_j will show us where to go back to */
PlaylistEntry *playlist_position_before_jump = NULL;
G_LOCK_DEFINE(playlists);

static GList *playlists = NULL;

static Playlist default_playlist = {
	"Default",
#ifdef HAVE_XSPF
	"playlist.xspf",

static void playlist_recalc_total_time_nolock(Playlist *);
static void playlist_recalc_total_time(Playlist *);
static gboolean playlist_entry_get_info(PlaylistEntry * entry);

PlaylistEntry *
playlist_entry_new(const gchar * filename,
                   const gchar * title,
                   const gint length,
		   InputPlugin * dec)

    entry->tuple = tuple;

    return TRUE;
}

const gchar *
playlist_get_current_name(Playlist *playlist)
{
    return playlist->title;
}

gboolean
playlist_set_current_name(Playlist *playlist, const gchar * filename)
{
#ifdef NOTYET
    g_free(playlist->title);
#endif

    if (!filename) {
        playlist->title = NULL;
        return FALSE;
    }

    playlist->pl_total_time = 0;
    playlist->pl_selection_time = 0;
    playlist->pl_total_more = FALSE;
    playlist->pl_selection_more = FALSE;

    for (list = playlist_get(); list; list = g_list_next(list)) {
        entry = list->data;

        if (entry->length != -1)
            playlist->pl_total_time += entry->length / 1000;
        else

}

Playlist *
playlist_get_active(void)
{
    return &default_playlist;
};

void
playlist_set_shuffle(gboolean shuffle)
{
    PLAYLIST_LOCK();

{
    Playlist *playlist = g_new0(Playlist, 1);

    playlist_set_current_name(playlist, NULL);
    playlist_clear(playlist);
    mainwin_clear_song_info();
    mainwin_set_info_text();

    return playlist;
}

2120:1d67cf383e32

/* If we manually change the song, p_p_b_j will show us where to go back to */
PlaylistEntry *playlist_position_before_jump = NULL;
G_LOCK_DEFINE(playlists);

static GList *playlists = NULL;
static GList *playlists_iter;

static Playlist default_playlist = {
	"Default",
#ifdef HAVE_XSPF
	"playlist.xspf",

static void playlist_recalc_total_time_nolock(Playlist *);
static void playlist_recalc_total_time(Playlist *);
static gboolean playlist_entry_get_info(PlaylistEntry * entry);

/* *********************** playlist entry code ********************** */

PlaylistEntry *
playlist_entry_new(const gchar * filename,
                   const gchar * title,
                   const gint length,
		   InputPlugin * dec)

    entry->tuple = tuple;

    return TRUE;
}

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

void
playlist_init(void)
{
    Playlist *initial_pl;

    REQUIRE_STATIC_LOCK(playlists);

    initial_pl = playlist_new();

    playlist_add_playlist(initial_pl);
}

void
playlist_add_playlist(Playlist *playlist)
{
    playlists = g_list_append(playlists, playlist);

    if (playlists_iter == NULL)
        playlists_iter = playlists;
}

void
playlist_remove_playlist(Playlist *playlist)
{
    playlists = g_list_remove(playlists, playlist);

    if (playlists_iter == NULL)
        playlists_iter = playlists;
}

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

const gchar *
playlist_get_current_name(Playlist *playlist)
{
    return playlist->title;
}

gboolean
playlist_set_current_name(Playlist *playlist, const gchar * filename)
{
    if (playlist->title)
        g_free(playlist->title);

    if (!filename) {
        playlist->title = NULL;
        return FALSE;
    }

    playlist->pl_total_time = 0;
    playlist->pl_selection_time = 0;
    playlist->pl_total_more = FALSE;
    playlist->pl_selection_more = FALSE;

    for (list = playlist->entries; list; list = g_list_next(list)) {
        entry = list->data;

        if (entry->length != -1)
            playlist->pl_total_time += entry->length / 1000;
        else

}

Playlist *
playlist_get_active(void)
{
    if (playlists_iter != NULL)
        return (Playlist *) playlists_iter->data;

    return (Playlist *) playlists->data;
}

void
playlist_set_shuffle(gboolean shuffle)
{
    PLAYLIST_LOCK();

{
    Playlist *playlist = g_new0(Playlist, 1);

    playlist_set_current_name(playlist, NULL);
    playlist_clear(playlist);

    return playlist;
}