X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fscreen_artist.c;h=03d7155b4366aa5ee7b671496d5ed057a9613257;hb=e87293c67c377130dcda2f5cb4b1ddd06026f551;hp=8e9732b8bf748b159f6dad7a0502e2cc60f777bc;hpb=4f7926a989e2428a4701de3410e80997867ff63b;p=ncmpc.git diff --git a/src/screen_artist.c b/src/screen_artist.c index 8e9732b..03d7155 100644 --- a/src/screen_artist.c +++ b/src/screen_artist.c @@ -1,29 +1,25 @@ -/* - * $Id$ - * - * (c) 2005 by Kalle Wallin - * +/* ncmpc (Ncurses MPD Client) + * (c) 2004-2009 The Music Player Daemon Project + * Project homepage: http://musicpd.org + * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - */ -#include "config.h" + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +*/ -#ifndef DISABLE_ARTIST_SCREEN -#include "ncmpc.h" +#include "i18n.h" #include "options.h" -#include "support.h" +#include "charset.h" #include "mpdclient.h" #include "utils.h" #include "strfsong.h" @@ -31,23 +27,21 @@ #include "screen.h" #include "screen_utils.h" #include "screen_browser.h" -#include "gcc.h" +#include "filelist.h" #include #include #include #include -#include #define BUFSIZE 1024 typedef enum { LIST_ARTISTS, LIST_ALBUMS, LIST_SONGS } artist_mode_t; static artist_mode_t mode = LIST_ARTISTS; +static GPtrArray *artist_list, *album_list; static char *artist = NULL; static char *album = NULL; -static unsigned metalist_length = 0; -static GList *metalist = NULL; static struct screen_browser browser; @@ -67,14 +61,32 @@ compare_utf8(gconstpointer s1, gconstpointer s2) /* list_window callback */ static const char * -artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data) +artist_lw_callback(unsigned idx, G_GNUC_UNUSED bool *highlight, + G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data) { + GPtrArray *list = data; static char buf[BUFSIZE]; char *str, *str_utf8; - if ((str_utf8 = (char *)g_list_nth_data(metalist, idx)) == NULL) + if (mode == LIST_ALBUMS) { + if (idx == 0) + return "[..]"; + else if (idx == list->len + 1) { + str = utf8_to_locale(_("All tracks")); + g_snprintf(buf, BUFSIZE, "[%s]", str); + g_free(str); + return buf; + } + + --idx; + } + + if (idx >= list->len) return NULL; + str_utf8 = g_ptr_array_index(list, idx); + assert(str_utf8 != NULL); + str = utf8_to_locale(str_utf8); g_snprintf(buf, BUFSIZE, "[%s]", str); g_free(str); @@ -82,113 +94,238 @@ artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *dat return buf; } -/* the playlist have been updated -> fix highlights */ static void -playlist_changed_callback(mpdclient_t *c, int event, mpd_unused gpointer data) +paint(void); + +static void +artist_repaint(void) { - if (browser.filelist == NULL) - return; + paint(); + wrefresh(browser.lw->w); +} - D("screen_artist.c> playlist_callback() [%d]\n", event); - switch(event) { - case PLAYLIST_EVENT_CLEAR: - clear_highlights(browser.filelist); - break; - default: - sync_highlights(c, browser.filelist); - break; +static void +artist_repaint_if_active(void) +{ + if (screen_is_visible(&screen_artist)) + artist_repaint(); +} + +#ifndef NCMPC_MINI +/* the playlist has been updated -> fix highlights */ +static void +playlist_changed_callback(struct mpdclient *c, int event, gpointer data) +{ + browser_playlist_changed(&browser, c, event, data); + + artist_repaint_if_active(); +} +#endif + +static GPtrArray * +g_list_to_ptr_array(GList *in) +{ + GPtrArray *out = g_ptr_array_sized_new(g_list_length(in)); + GList *head = in; + + while (in != NULL) { + g_ptr_array_add(out, in->data); + in = g_list_next(in); + } + + g_list_free(head); + return out; +} + +static void +string_array_free(GPtrArray *array) +{ + unsigned i; + + for (i = 0; i < array->len; ++i) { + char *value = g_ptr_array_index(array, i); + g_free(value); } + + g_ptr_array_free(array, TRUE); } -/* fetch artists/albums/songs from mpd */ static void -update_metalist(mpdclient_t *c, char *m_artist, char *m_album) +free_lists(G_GNUC_UNUSED struct mpdclient *c) +{ + if (artist_list != NULL) { + string_array_free(artist_list); + artist_list = NULL; + } + + if (album_list != NULL) { + string_array_free(album_list); + album_list = NULL; + } + + if (browser.filelist) { +#ifndef NCMPC_MINI + if (c != NULL) + mpdclient_remove_playlist_callback(c, playlist_changed_callback); +#endif + filelist_free(browser.filelist); + browser.filelist = NULL; + } +} + +static void +load_artist_list(struct mpdclient *c) +{ + GList *list; + + assert(mode == LIST_ARTISTS); + assert(artist == NULL); + assert(album == NULL); + assert(artist_list == NULL); + assert(album_list == NULL); + assert(browser.filelist == NULL); + + list = mpdclient_get_artists(c); + /* sort list */ + list = g_list_sort(list, compare_utf8); + + artist_list = g_list_to_ptr_array(list); +} + +static void +load_album_list(struct mpdclient *c) +{ + GList *list; + + assert(mode == LIST_ALBUMS); + assert(artist != NULL); + assert(album == NULL); + assert(album_list == NULL); + assert(browser.filelist == NULL); + + list = mpdclient_get_albums(c, artist); + /* sort list */ + list = g_list_sort(list, compare_utf8); + + album_list = g_list_to_ptr_array(list); +} + +static void +load_song_list(struct mpdclient *c) +{ + assert(mode == LIST_SONGS); + assert(artist != NULL); + assert(album != NULL); + assert(browser.filelist == NULL); + + if (album[0] == 0) + browser.filelist = + mpdclient_filelist_search(c, TRUE, + MPD_TAG_ARTIST, + artist); + else + browser.filelist = + mpdclient_filelist_search(c, TRUE, + MPD_TAG_ALBUM, + album); + if (browser.filelist == NULL) + browser.filelist = filelist_new(); + + /* add a dummy entry for ".." */ + filelist_prepend(browser.filelist, NULL); + +#ifndef NCMPC_MINI + /* install playlist callback and fix highlights */ + sync_highlights(c, browser.filelist); + mpdclient_install_playlist_callback(c, playlist_changed_callback); +#endif +} + +static void +free_state(struct mpdclient *c) { g_free(artist); g_free(album); artist = NULL; album = NULL; - if (metalist) - metalist = string_list_free(metalist); - if (browser.filelist) { - mpdclient_remove_playlist_callback(c, playlist_changed_callback); - mpdclient_filelist_free(browser.filelist); - browser.filelist = NULL; - } + free_lists(c); +} - if (m_album) { - /* retreive songs... */ - filelist_entry_t *entry; - - artist = m_artist; - album = m_album; - if (album[0] == 0) { - album = g_strdup(_("All tracks")); - browser.filelist = - mpdclient_filelist_search_utf8(c, TRUE, - MPD_TABLE_ARTIST, - artist); - } else - browser.filelist = - mpdclient_filelist_search_utf8(c, TRUE, - MPD_TABLE_ALBUM, - album); - /* add a dummy entry for ".." */ - entry = g_malloc0(sizeof(filelist_entry_t)); - entry->entity = NULL; - browser.filelist->list = g_list_insert(browser.filelist->list, - entry, 0); - browser.filelist->length++; - /* install playlist callback and fix highlights */ - sync_highlights(c, browser.filelist); - mpdclient_install_playlist_callback(c, playlist_changed_callback); - mode = LIST_SONGS; - } else if (m_artist) { - /* retreive albums... */ - - artist = m_artist; - metalist = mpdclient_get_albums_utf8(c, m_artist); - /* sort list */ - metalist = g_list_sort(metalist, compare_utf8); - /* add a dummy entry for ".." */ - metalist = g_list_insert(metalist, g_strdup(".."), 0); - /* add a dummy entry for all songs */ - metalist = g_list_insert(metalist, g_strdup(_("All tracks")), -1); - mode = LIST_ALBUMS; - } else { - /* retreive artists... */ - - metalist = mpdclient_get_artists_utf8(c); - /* sort list */ - metalist = g_list_sort(metalist, compare_utf8); - mode = LIST_ARTISTS; +static void +open_artist_list(struct mpdclient *c) +{ + free_state(c); + + mode = LIST_ARTISTS; + load_artist_list(c); +} + +static void +open_album_list(struct mpdclient *c, char *_artist) +{ + assert(_artist != NULL); + + free_state(c); + + mode = LIST_ALBUMS; + artist = _artist; + load_album_list(c); +} + +static void +open_song_list(struct mpdclient *c, char *_artist, char *_album) +{ + assert(_artist != NULL); + assert(_album != NULL); + + free_state(c); + + mode = LIST_SONGS; + artist = _artist; + album = _album; + load_song_list(c); +} + +static void +reload_lists(struct mpdclient *c) +{ + free_lists(c); + + switch (mode) { + case LIST_ARTISTS: + load_artist_list(c); + break; + + case LIST_ALBUMS: + load_album_list(c); + break; + + case LIST_SONGS: + load_song_list(c); + break; } - metalist_length = g_list_length(metalist); - browser.lw->clear = TRUE; } /* db updated */ static void -browse_callback(mpdclient_t *c, int event, mpd_unused gpointer data) +browse_callback(struct mpdclient *c, int event, G_GNUC_UNUSED gpointer data) { switch(event) { case BROWSE_DB_UPDATED: - D("screen_artist.c> browse_callback() [BROWSE_DB_UPDATED]\n"); - browser.lw->clear = 1; - browser.lw->repaint = 1; - update_metalist(c, g_strdup(artist), g_strdup(album)); + reload_lists(c); break; default: break; } + + artist_repaint_if_active(); } static void init(WINDOW *w, int cols, int rows) { browser.lw = list_window_init(w, cols, rows); - browser.lw_state = list_window_init_state(); artist = NULL; album = NULL; } @@ -196,25 +333,18 @@ init(WINDOW *w, int cols, int rows) static void quit(void) { - if (browser.filelist) - mpdclient_filelist_free(browser.filelist); - if (metalist) - string_list_free(metalist); - g_free(artist); - g_free(album); - artist = NULL; - album = NULL; + free_state(NULL); list_window_free(browser.lw); - list_window_free_state(browser.lw_state); } static void -open(mpd_unused screen_t *screen, mpdclient_t *c) +open(struct mpdclient *c) { static gboolean callback_installed = FALSE; - if (metalist == NULL && browser.filelist == NULL) - update_metalist(c, NULL, NULL); + if (artist_list == NULL && album_list == NULL && + browser.filelist == NULL) + reload_lists(c); if (!callback_installed) { mpdclient_install_browse_callback(c, browse_callback); callback_installed = TRUE; @@ -229,131 +359,192 @@ resize(int cols, int rows) } static void -paint(mpd_unused screen_t *screen, mpd_unused mpdclient_t *c) +paint(void) { - browser.lw->clear = 1; - if (browser.filelist) { - list_window_paint(browser.lw, browse_lw_callback, + list_window_paint(browser.lw, browser_lw_callback, browser.filelist); - browser.filelist->updated = FALSE; - } else if (metalist) { - list_window_paint(browser.lw, artist_lw_callback, metalist); - } else { + } else if (album_list != NULL) + list_window_paint(browser.lw, artist_lw_callback, album_list); + else if (artist_list != NULL) + list_window_paint(browser.lw, artist_lw_callback, artist_list); + else { wmove(browser.lw->w, 0, 0); wclrtobot(browser.lw->w); } - - wnoutrefresh(browser.lw->w); -} - -static void -update(screen_t *screen, mpdclient_t *c) -{ - if (browser.filelist && !browser.filelist->updated) - list_window_paint(browser.lw, browse_lw_callback, - browser.filelist); - else if (metalist) - list_window_paint(browser.lw, artist_lw_callback, metalist); - else - paint(screen, c); - wnoutrefresh(browser.lw->w); } static const char * get_title(char *str, size_t size) { - char *s1 = artist ? utf8_to_locale(artist) : NULL; - char *s2 = album ? utf8_to_locale(album) : NULL; + char *s1, *s2; switch(mode) { case LIST_ARTISTS: - g_snprintf(str, size, _("Artist: [db browser - EXPERIMENTAL]")); + g_snprintf(str, size, _("All artists")); break; + case LIST_ALBUMS: - g_snprintf(str, size, _("Artist: %s"), s1); + s1 = utf8_to_locale(artist); + g_snprintf(str, size, _("Albums of artist: %s"), s1); + g_free(s1); break; + case LIST_SONGS: - g_snprintf(str, size, _("Artist: %s - %s"), s1, s2); + s1 = utf8_to_locale(artist); + if (*album != 0) { + s2 = utf8_to_locale(album); + g_snprintf(str, size, + _("Album: %s - %s"), s1, s2); + g_free(s2); + } else + g_snprintf(str, size, + _("All tracks of artist: %s"), s1); + g_free(s1); break; } - g_free(s1); - g_free(s2); + return str; } static void -add_query(mpdclient_t *c, int table, char *_filter) +add_query(struct mpdclient *c, enum mpd_tag_type table, char *_filter) { char *str; - mpdclient_filelist_t *addlist; + struct filelist *addlist; + + assert(filter != NULL); str = utf8_to_locale(_filter); - if (table== MPD_TABLE_ALBUM) + if (table == MPD_TAG_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(c, TRUE, table, _filter); if (addlist) { mpdclient_filelist_add_all(c, addlist); - mpdclient_filelist_free(addlist); + filelist_free(addlist); } } +static unsigned +metalist_length(void) +{ + assert(mode != LIST_ARTISTS || artist_list != NULL); + assert(mode != LIST_ALBUMS || album_list != NULL); + + return mode == LIST_ALBUMS + ? album_list->len + 2 + : artist_list->len; +} + static int -artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd) +artist_lw_cmd(struct mpdclient *c, command_t cmd) +{ + switch (mode) { + case LIST_ARTISTS: + case LIST_ALBUMS: + return list_window_cmd(browser.lw, metalist_length(), cmd); + + case LIST_SONGS: + return browser_cmd(&browser, c, cmd); + } + + assert(0); + return 0; +} + +static int +string_array_find(GPtrArray *array, const char *value) +{ + guint i; + + for (i = 0; i < array->len; ++i) + if (strcmp((const char*)g_ptr_array_index(array, i), + value) == 0) + return i; + + return -1; +} + +static bool +artist_cmd(struct mpdclient *c, command_t cmd) { char *selected; + char *old; + int idx; switch(cmd) { case CMD_PLAY: switch (mode) { case LIST_ARTISTS: - selected = (char *) g_list_nth_data(metalist, - browser.lw->selected); - update_metalist(c, g_strdup(selected), NULL); - list_window_push_state(browser.lw_state, browser.lw); - break; + selected = g_ptr_array_index(artist_list, + browser.lw->selected); + open_album_list(c, g_strdup(selected)); + list_window_reset(browser.lw); + + artist_repaint(); + return true; case LIST_ALBUMS: if (browser.lw->selected == 0) { /* handle ".." */ + old = g_strdup(artist); - update_metalist(c, NULL, NULL); + open_artist_list(c); list_window_reset(browser.lw); /* restore previous list window state */ - list_window_pop_state(browser.lw_state, browser.lw); - } else if (browser.lw->selected == metalist_length - 1) { + idx = string_array_find(artist_list, old); + g_free(old); + + if (idx >= 0) { + list_window_set_selected(browser.lw, idx); + list_window_center(browser.lw, + artist_list->len, idx); + } + } else if (browser.lw->selected == album_list->len + 1) { /* handle "show all" */ - update_metalist(c, g_strdup(artist), g_strdup("\0")); - list_window_push_state(browser.lw_state, browser.lw); + open_song_list(c, g_strdup(artist), g_strdup("\0")); + list_window_reset(browser.lw); } else { /* select album */ - selected = g_list_nth_data(metalist, - browser.lw->selected); - update_metalist(c, g_strdup(artist), g_strdup(selected)); - list_window_push_state(browser.lw_state, browser.lw); + selected = g_ptr_array_index(album_list, + browser.lw->selected - 1); + open_song_list(c, g_strdup(artist), g_strdup(selected)); + list_window_reset(browser.lw); } - break; + + artist_repaint(); + return true; case LIST_SONGS: if (browser.lw->selected == 0) { /* handle ".." */ + old = g_strdup(album); - update_metalist(c, g_strdup(artist), NULL); + open_album_list(c, g_strdup(artist)); list_window_reset(browser.lw); /* restore previous list window state */ - list_window_pop_state(browser.lw_state, - browser.lw); - } else - browse_handle_enter(screen, c, browser.lw, - browser.filelist); + idx = *old == 0 + ? (int)album_list->len + : string_array_find(album_list, old); + g_free(old); + + if (idx >= 0) { + ++idx; + list_window_set_selected(browser.lw, idx); + list_window_center(browser.lw, + album_list->len, idx); + } + + artist_repaint(); + return true; + } break; } - return 1; - + break; /* FIXME? CMD_GO_* handling duplicates code from CMD_PLAY */ @@ -363,19 +554,42 @@ artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd) break; case LIST_ALBUMS: - update_metalist(c, NULL, NULL); + old = g_strdup(artist); + + open_artist_list(c); list_window_reset(browser.lw); /* restore previous list window state */ - list_window_pop_state(browser.lw_state, browser.lw); + idx = string_array_find(artist_list, old); + g_free(old); + + if (idx >= 0) { + list_window_set_selected(browser.lw, idx); + list_window_center(browser.lw, + artist_list->len, idx); + } break; case LIST_SONGS: - update_metalist(c, g_strdup(artist), NULL); + old = g_strdup(album); + + open_album_list(c, g_strdup(artist)); list_window_reset(browser.lw); /* restore previous list window state */ - list_window_pop_state(browser.lw_state, browser.lw); + idx = *old == 0 + ? (int)album_list->len + : string_array_find(album_list, old); + g_free(old); + + if (idx >= 0) { + ++idx; + list_window_set_selected(browser.lw, idx); + list_window_center(browser.lw, + album_list->len, idx); + } break; } + + artist_repaint(); break; case CMD_GO_ROOT_DIRECTORY: @@ -385,83 +599,110 @@ artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd) case LIST_ALBUMS: case LIST_SONGS: - update_metalist(c, NULL, NULL); + open_artist_list(c); list_window_reset(browser.lw); /* restore first list window state (pop while returning true) */ - while(list_window_pop_state(browser.lw_state, browser.lw)); + /* XXX */ break; } + + artist_repaint(); break; case CMD_SELECT: + case CMD_ADD: switch(mode) { case LIST_ARTISTS: - selected = g_list_nth_data(metalist, - browser.lw->selected); - add_query(c, MPD_TABLE_ARTIST, selected); - cmd = CMD_LIST_NEXT; /* continue and select next item... */ + { + unsigned i; + for(i = browser.lw->selected_start; i <= browser.lw->selected_end; ++i) + { + selected = g_ptr_array_index(artist_list, i); + add_query(c, MPD_TAG_ARTIST, selected); + cmd = CMD_LIST_NEXT; /* continue and select next item... */ + } break; - + } case LIST_ALBUMS: - if (browser.lw->selected && - browser.lw->selected == metalist_length - 1) - add_query(c, MPD_TABLE_ARTIST, artist); - else if (browser.lw->selected > 0) { - selected = g_list_nth_data(metalist, - browser.lw->selected); - add_query(c, MPD_TABLE_ALBUM, selected); - cmd = CMD_LIST_NEXT; /* continue and select next item... */ + { + unsigned i; + for(i = browser.lw->selected_start; i <= browser.lw->selected_end; ++i) + { + if(i == album_list->len + 1) + add_query(c, MPD_TAG_ARTIST, artist); + else if (i > 0) + { + selected = g_ptr_array_index(album_list, + browser.lw->selected - 1); + add_query(c, MPD_TAG_ALBUM, selected); + cmd = CMD_LIST_NEXT; /* continue and select next item... */ + } } break; + } case LIST_SONGS: - if (browse_handle_select(screen, c, browser.lw, - browser.filelist) == 0) - /* continue and select next item... */ - cmd = CMD_LIST_NEXT; + /* handled by browser_cmd() */ break; } break; /* continue and update... */ case CMD_SCREEN_UPDATE: - screen->painted = 0; - browser.lw->clear = 1; - browser.lw->repaint = 1; - update_metalist(c, g_strdup(artist), g_strdup(album)); - screen_status_printf(_("Screen updated!")); - return 0; + reload_lists(c); + return false; case CMD_LIST_FIND: case CMD_LIST_RFIND: case CMD_LIST_FIND_NEXT: case CMD_LIST_RFIND_NEXT: - if (browser.filelist) - return screen_find(screen, - browser.lw, browser.filelist->length, - cmd, browse_lw_callback, - browser.filelist); - else if (metalist) - return screen_find(screen, - browser.lw, metalist_length, - cmd, artist_lw_callback, metalist); - else - return 1; - - case CMD_MOUSE_EVENT: - return browse_handle_mouse_event(screen, c,browser.lw, - browser.filelist); + switch (mode) { + case LIST_ARTISTS: + screen_find(browser.lw, artist_list->len, + cmd, artist_lw_callback, artist_list); + artist_repaint(); + return true; + + case LIST_ALBUMS: + screen_find(browser.lw, album_list->len + 2, + cmd, artist_lw_callback, album_list); + artist_repaint(); + return true; + + case LIST_SONGS: + /* handled by browser_cmd() */ + break; + } + case CMD_LIST_JUMP: + switch (mode) { + case LIST_ARTISTS: + screen_jump(browser.lw, artist_lw_callback, artist_list); + artist_repaint(); + return true; + + case LIST_ALBUMS: + screen_jump(browser.lw, artist_lw_callback, album_list); + artist_repaint(); + return true; + + case LIST_SONGS: + /* handled by browser_cmd() */ + break; + } + + break; default: break; } - if (browser.filelist) - return list_window_cmd(browser.lw, browser.filelist->length, cmd); - else if (metalist) - return list_window_cmd(browser.lw, metalist_length, cmd); + if (artist_lw_cmd(c, cmd)) { + if (screen_is_visible(&screen_artist)) + artist_repaint(); + return true; + } - return 0; + return false; } const struct screen_functions screen_artist = { @@ -470,9 +711,6 @@ const struct screen_functions screen_artist = { .open = open, .resize = resize, .paint = paint, - .update = update, .cmd = artist_cmd, .get_title = get_title, }; - -#endif /* ENABLE_ARTIST_SCREEN */