![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 71f48514b53cb3d72bb5eb27f1b7a20abc3924c3..03b4fed421ab69165d61a4776f750f389e834875 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
-/*
- * $Id$
- *
+/*
* (c) 2005 by Kalle Wallin <kaw@linux.se>
*
* This program is free software; you can redistribute it and/or modify
*
*/
-#include "config.h"
-
-#ifndef DISABLE_ARTIST_SCREEN
#include "ncmpc.h"
#include "options.h"
#include "support.h"
#include "command.h"
#include "screen.h"
#include "screen_utils.h"
-#include "screen_browse.h"
+#include "screen_browser.h"
+#include "gcc.h"
#include <ctype.h>
#include <stdlib.h>
static artist_mode_t mode = LIST_ARTISTS;
static char *artist = NULL;
static char *album = NULL;
-static list_window_t *lw = NULL;
-static mpdclient_filelist_t *filelist = NULL;
-static int metalist_length = 0;
+static unsigned metalist_length = 0;
static GList *metalist = NULL;
-static list_window_state_t *lw_state = NULL;
+
+static struct screen_browser browser;
static gint
compare_utf8(gconstpointer s1, gconstpointer s2)
}
/* list_window callback */
-static char *
-artist_lw_callback(int index, int *highlight, void *data)
+static const char *
+artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data)
{
static char buf[BUFSIZE];
char *str, *str_utf8;
- if ((str_utf8=(char *) g_list_nth_data(metalist,index)) == NULL)
+ if ((str_utf8 = (char *)g_list_nth_data(metalist, idx)) == NULL)
return NULL;
str = utf8_to_locale(str_utf8);
return buf;
}
+static void
+paint(mpdclient_t *c);
+
+static void
+artist_repaint(void)
+{
+ paint(NULL);
+ wrefresh(browser.lw->w);
+}
+
+static void
+artist_repaint_if_active(void)
+{
+ if (screen_is_visible(&screen_artist))
+ artist_repaint();
+}
+
/* the playlist have been updated -> fix highlights */
static void
playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
- if (filelist == NULL)
- return;
+ browser_playlist_changed(&browser, c, event, data);
- D("screen_artist.c> playlist_callback() [%d]\n", event);
- switch(event) {
- case PLAYLIST_EVENT_CLEAR:
- clear_highlights(filelist);
- break;
- default:
- sync_highlights(c, filelist);
- break;
- }
+ artist_repaint_if_active();
}
/* fetch artists/albums/songs from mpd */
if (metalist)
metalist = string_list_free(metalist);
- if (filelist) {
+ if (browser.filelist) {
mpdclient_remove_playlist_callback(c, playlist_changed_callback);
- filelist = mpdclient_filelist_free(filelist);
+ filelist_free(browser.filelist);
+ browser.filelist = NULL;
}
+
if (m_album) {
/* retreive songs... */
-
artist = m_artist;
album = m_album;
if (album[0] == 0) {
album = g_strdup(_("All tracks"));
- filelist = mpdclient_filelist_search_utf8(c,
- TRUE,
- MPD_TABLE_ARTIST,
- artist);
+ browser.filelist =
+ mpdclient_filelist_search_utf8(c, TRUE,
+ MPD_TABLE_ARTIST,
+ artist);
} else
- filelist = mpdclient_filelist_search_utf8(c,
- TRUE,
- MPD_TABLE_ALBUM,
- album);
+ browser.filelist =
+ mpdclient_filelist_search_utf8(c, TRUE,
+ MPD_TABLE_ALBUM,
+ album);
+ if (browser.filelist == NULL)
+ browser.filelist = filelist_new(NULL);
+
/* add a dummy entry for ".." */
- filelist_entry_t *entry = g_malloc0(sizeof(filelist_entry_t));
- entry->entity = NULL;
- filelist->list = g_list_insert(filelist->list, entry, 0);
- filelist->length++;
+ filelist_prepend(browser.filelist, NULL);
+
/* install playlist callback and fix highlights */
- sync_highlights(c, filelist);
+ sync_highlights(c, browser.filelist);
mpdclient_install_playlist_callback(c, playlist_changed_callback);
mode = LIST_SONGS;
} else if (m_artist) {
mode = LIST_ARTISTS;
}
metalist_length = g_list_length(metalist);
- lw->clear = TRUE;
}
/* db updated */
static void
-browse_callback(mpdclient_t *c, int event, gpointer data)
+browse_callback(mpdclient_t *c, int event, mpd_unused gpointer data)
{
switch(event) {
case BROWSE_DB_UPDATED:
D("screen_artist.c> browse_callback() [BROWSE_DB_UPDATED]\n");
- lw->clear = 1;
- lw->repaint = 1;
update_metalist(c, g_strdup(artist), g_strdup(album));
break;
default:
break;
}
+
+ artist_repaint_if_active();
}
static void
init(WINDOW *w, int cols, int rows)
{
- lw = list_window_init(w, cols, rows);
- lw_state = list_window_init_state();
+ browser.lw = list_window_init(w, cols, rows);
+ browser.lw_state = list_window_init_state();
artist = NULL;
album = NULL;
}
static void
quit(void)
{
- if (filelist)
- filelist = mpdclient_filelist_free(filelist);
+ if (browser.filelist)
+ filelist_free(browser.filelist);
if (metalist)
- metalist = string_list_free(metalist);
+ string_list_free(metalist);
g_free(artist);
g_free(album);
artist = NULL;
album = NULL;
- lw = list_window_free(lw);
- lw_state = list_window_free_state(lw_state);
+ list_window_free(browser.lw);
+ list_window_free_state(browser.lw_state);
}
static void
-open(screen_t *screen, mpdclient_t *c)
+open(mpd_unused screen_t *screen, mpdclient_t *c)
{
static gboolean callback_installed = FALSE;
- if (metalist == NULL && filelist == NULL)
+ if (metalist == NULL && browser.filelist == NULL)
update_metalist(c, NULL, NULL);
if (!callback_installed) {
mpdclient_install_browse_callback(c, browse_callback);
static void
resize(int cols, int rows)
{
- lw->cols = cols;
- lw->rows = rows;
+ browser.lw->cols = cols;
+ browser.lw->rows = rows;
}
static void
-close(void)
+paint(mpd_unused mpdclient_t *c)
{
-}
-
-static void
-paint(screen_t *screen, mpdclient_t *c)
-{
- lw->clear = 1;
-
- if (filelist) {
- list_window_paint(lw, browse_lw_callback, (void *) filelist);
- filelist->updated = FALSE;
+ if (browser.filelist) {
+ list_window_paint(browser.lw, browser_lw_callback,
+ browser.filelist);
} else if (metalist) {
- list_window_paint(lw, artist_lw_callback, (void *) metalist);
+ list_window_paint(browser.lw, artist_lw_callback, metalist);
} else {
- wmove(lw->w, 0, 0);
- wclrtobot(lw->w);
+ wmove(browser.lw->w, 0, 0);
+ wclrtobot(browser.lw->w);
}
-
- wnoutrefresh(lw->w);
-}
-
-static void
-update(screen_t *screen, mpdclient_t *c)
-{
- if (filelist && !filelist->updated)
- list_window_paint(lw, browse_lw_callback, (void *) filelist);
- else if (metalist)
- list_window_paint(lw, artist_lw_callback, (void *) metalist);
- else
- paint(screen, c);
- wnoutrefresh(lw->w);
}
-static char *
+static const char *
get_title(char *str, size_t size)
{
char *s1 = artist ? utf8_to_locale(artist) : NULL;
return str;
}
-static list_window_t *
-get_filelist_window()
-{
- return lw;
-}
-
static void
-add_query(mpdclient_t *c, int table, char *filter)
+add_query(mpdclient_t *c, int table, char *_filter)
{
char *str;
mpdclient_filelist_t *addlist;
- str = utf8_to_locale(filter);
+ assert(filter != NULL);
+
+ str = utf8_to_locale(_filter);
if (table== MPD_TABLE_ALBUM)
screen_status_printf("Adding album %s...", str);
else
screen_status_printf("Adding %s...", str);
g_free(str);
- addlist = mpdclient_filelist_search_utf8(c, TRUE, table, filter);
+ addlist = mpdclient_filelist_search_utf8(c, TRUE, table, _filter);
if (addlist) {
mpdclient_filelist_add_all(c, addlist);
- addlist = mpdclient_filelist_free(addlist);
+ filelist_free(addlist);
+ }
+}
+
+static int
+artist_lw_cmd(command_t cmd)
+{
+ switch (mode) {
+ case LIST_ARTISTS:
+ case LIST_ALBUMS:
+ return list_window_cmd(browser.lw, metalist_length, cmd);
+
+ case LIST_SONGS:
+ return list_window_cmd(browser.lw,
+ filelist_length(browser.filelist),
+ cmd);
}
+
+ assert(0);
+ return 0;
}
static int
artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
{
char *selected;
+ int ret;
+
+ if (artist_lw_cmd(cmd)) {
+ artist_repaint();
+ wrefresh(browser.lw->w);
+ return 1;
+ }
switch(cmd) {
case CMD_PLAY:
switch (mode) {
case LIST_ARTISTS:
- selected = (char *) g_list_nth_data(metalist, lw->selected);
+ selected = (char *) g_list_nth_data(metalist,
+ browser.lw->selected);
update_metalist(c, g_strdup(selected), NULL);
- list_window_push_state(lw_state,lw);
+ list_window_push_state(browser.lw_state, browser.lw);
+
+ list_window_paint(browser.lw, artist_lw_callback, metalist);
+ wrefresh(browser.lw->w);
break;
case LIST_ALBUMS:
- if (lw->selected == 0) {
+ if (browser.lw->selected == 0) {
/* handle ".." */
update_metalist(c, NULL, NULL);
- list_window_reset(lw);
+ list_window_reset(browser.lw);
/* restore previous list window state */
- list_window_pop_state(lw_state,lw);
- } else if (lw->selected == metalist_length - 1) {
+ list_window_pop_state(browser.lw_state, browser.lw);
+ } else if (browser.lw->selected == metalist_length - 1) {
/* handle "show all" */
update_metalist(c, g_strdup(artist), g_strdup("\0"));
- list_window_push_state(lw_state,lw);
+ list_window_push_state(browser.lw_state, browser.lw);
} else {
/* select album */
- selected = (char *) g_list_nth_data(metalist, lw->selected);
+ selected = g_list_nth_data(metalist,
+ browser.lw->selected);
update_metalist(c, g_strdup(artist), g_strdup(selected));
- list_window_push_state(lw_state,lw);
+ list_window_push_state(browser.lw_state, browser.lw);
}
+
+ artist_repaint();
break;
case LIST_SONGS:
- if (lw->selected == 0) {
+ if (browser.lw->selected == 0) {
/* handle ".." */
update_metalist(c, g_strdup(artist), NULL);
- list_window_reset(lw);
+ list_window_reset(browser.lw);
/* restore previous list window state */
- list_window_pop_state(lw_state,lw);
+ list_window_pop_state(browser.lw_state,
+ browser.lw);
+
+ list_window_paint(browser.lw, artist_lw_callback, metalist);
+ wrefresh(browser.lw->w);
} else
- browse_handle_enter(screen, c, lw, filelist);
+ browser_handle_enter(&browser, c);
break;
}
return 1;
case CMD_GO_PARENT_DIRECTORY:
switch (mode) {
+ case LIST_ARTISTS:
+ break;
+
case LIST_ALBUMS:
update_metalist(c, NULL, NULL);
- list_window_reset(lw);
+ list_window_reset(browser.lw);
/* restore previous list window state */
- list_window_pop_state(lw_state,lw);
+ list_window_pop_state(browser.lw_state, browser.lw);
break;
case LIST_SONGS:
update_metalist(c, g_strdup(artist), NULL);
- list_window_reset(lw);
+ list_window_reset(browser.lw);
/* restore previous list window state */
- list_window_pop_state(lw_state,lw);
+ list_window_pop_state(browser.lw_state, browser.lw);
break;
}
+
+ artist_repaint();
break;
case CMD_GO_ROOT_DIRECTORY:
switch (mode) {
+ case LIST_ARTISTS:
+ break;
+
case LIST_ALBUMS:
case LIST_SONGS:
update_metalist(c, NULL, NULL);
- list_window_reset(lw);
+ list_window_reset(browser.lw);
/* restore first list window state (pop while returning true) */
- while(list_window_pop_state(lw_state,lw));
+ while(list_window_pop_state(browser.lw_state, browser.lw));
break;
}
+
+ artist_repaint();
break;
case CMD_SELECT:
+ case CMD_ADD:
switch(mode) {
case LIST_ARTISTS:
- selected = (char *) g_list_nth_data(metalist, lw->selected);
+ selected = g_list_nth_data(metalist,
+ browser.lw->selected);
+ if (selected == NULL)
+ return 1;
+
add_query(c, MPD_TABLE_ARTIST, selected);
cmd = CMD_LIST_NEXT; /* continue and select next item... */
break;
case LIST_ALBUMS:
- if (lw->selected && lw->selected == metalist_length - 1)
+ if (browser.lw->selected &&
+ browser.lw->selected == metalist_length - 1)
add_query(c, MPD_TABLE_ARTIST, artist);
- else if (lw->selected > 0) {
- selected = (char *) g_list_nth_data(metalist, lw->selected);
+ else if (browser.lw->selected > 0) {
+ selected = g_list_nth_data(metalist,
+ browser.lw->selected);
+ if (selected == NULL)
+ return 1;
+
add_query(c, MPD_TABLE_ALBUM, selected);
cmd = CMD_LIST_NEXT; /* continue and select next item... */
}
break;
case LIST_SONGS:
- if (browse_handle_select(screen, c, lw, filelist) == 0)
+ ret = cmd == CMD_SELECT
+ ? browser_handle_select(&browser, c)
+ : browser_handle_add(&browser, c);
+ if (ret == 0)
/* continue and select next item... */
cmd = CMD_LIST_NEXT;
break;
/* continue and update... */
case CMD_SCREEN_UPDATE:
- screen->painted = 0;
- lw->clear = 1;
- lw->repaint = 1;
update_metalist(c, g_strdup(artist), g_strdup(album));
screen_status_printf(_("Screen updated!"));
return 0;
case CMD_LIST_RFIND:
case CMD_LIST_FIND_NEXT:
case CMD_LIST_RFIND_NEXT:
- if (filelist)
- return screen_find(screen,
- lw, filelist->length,
- cmd, browse_lw_callback, (void *) filelist);
+ if (browser.filelist)
+ screen_find(screen,
+ browser.lw, filelist_length(browser.filelist),
+ cmd, browser_lw_callback,
+ browser.filelist);
else if (metalist)
- return screen_find(screen,
- lw, metalist_length,
- cmd, artist_lw_callback, (void *) metalist);
+ screen_find(screen,
+ browser.lw, metalist_length,
+ cmd, artist_lw_callback, metalist);
else
return 1;
+ artist_repaint();
+ return 1;
+
case CMD_MOUSE_EVENT:
- return browse_handle_mouse_event(screen,c,lw,filelist);
+ return browser_handle_mouse_event(&browser, c);
default:
break;
}
- if (filelist)
- return list_window_cmd(lw, filelist->length, cmd);
- else if (metalist)
- return list_window_cmd(lw, metalist_length, cmd);
-
return 0;
}
.init = init,
.exit = quit,
.open = open,
- .close = close,
.resize = resize,
.paint = paint,
- .update = update,
.cmd = artist_cmd,
- .get_lw = get_filelist_window,
.get_title = get_title,
};
-
-#endif /* ENABLE_ARTIST_SCREEN */