![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 3278f8fbf63926b98432dbb97388e6d58133ff14..cf775b5d5daf6f75b21a3cbf4c94aa614a1b1449 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#include "screen_interface.h"
#include "screen_message.h"
#include "screen_find.h"
+#include "screen_browser.h"
#include "screen.h"
#include "i18n.h"
#include "charset.h"
static GPtrArray *artist_list, *album_list;
static char *artist = NULL;
static char *album = NULL;
+static char ALL_TRACKS[] = "";
static struct screen_browser browser;
/* list_window callback */
static const char *
-screen_artist_lw_callback(unsigned idx, G_GNUC_UNUSED bool *highlight,
- G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data)
+screen_artist_lw_callback(unsigned idx, void *data)
{
GPtrArray *list = data;
static char buf[BUFSIZE];
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;
- }
+ return "..";
+ else if (idx == list->len + 1)
+ return _("All tracks");
--idx;
}
assert(str_utf8 != NULL);
str = utf8_to_locale(str_utf8);
- g_snprintf(buf, BUFSIZE, "[%s]", str);
+ g_strlcpy(buf, str, sizeof(buf));
g_free(str);
return buf;
assert(album != NULL);
assert(browser.filelist == NULL);
- mpd_search_db_songs(connection, true);
- mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
- MPD_TAG_ARTIST, artist);
- if (album[0] != 0)
- mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
- MPD_TAG_ALBUM, album);
- mpd_search_commit(connection);
-
browser.filelist = filelist_new();
/* add a dummy entry for ".." */
filelist_append(browser.filelist, NULL);
- filelist_recv(browser.filelist, connection);
+ if (connection != NULL) {
+ mpd_search_db_songs(connection, true);
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ MPD_TAG_ARTIST, artist);
+ if (album != ALL_TRACKS)
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ MPD_TAG_ALBUM, album);
+ mpd_search_commit(connection);
+
+ filelist_recv(browser.filelist, connection);
- if (!mpd_response_finish(connection))
- mpdclient_handle_error(c);
+ if (!mpd_response_finish(connection))
+ mpdclient_handle_error(c);
+ }
-#ifndef NCMPC_MINI
/* fix highlights */
screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
list_window_set_length(browser.lw, filelist_length(browser.filelist));
}
free_state(void)
{
g_free(artist);
- g_free(album);
+ if (album != ALL_TRACKS)
+ g_free(album);
artist = NULL;
album = NULL;
list_window_resize(browser.lw, cols, rows);
}
+/**
+ * Paint one item in the artist list.
+ */
+static void
+paint_artist_callback(WINDOW *w, unsigned i,
+ G_GNUC_UNUSED unsigned y, unsigned width,
+ bool selected, void *data)
+{
+ GPtrArray *list = data;
+ char *p = utf8_to_locale(g_ptr_array_index(list, i));
+
+ screen_browser_paint_directory(w, width, selected, p);
+ g_free(p);
+}
+
+/**
+ * Paint one item in the album list. There are two virtual items
+ * inserted: at the beginning, there's the special item ".." to go to
+ * the parent directory, and at the end, there's the item "All tracks"
+ * to view the tracks of all albums.
+ */
+static void
+paint_album_callback(WINDOW *w, unsigned i,
+ G_GNUC_UNUSED unsigned y, unsigned width,
+ bool selected, void *data)
+{
+ GPtrArray *list = data;
+ const char *p;
+ char *q = NULL;
+
+ if (i == 0)
+ p = "..";
+ else if (i == list->len + 1)
+ p = _("All tracks");
+ else
+ p = q = utf8_to_locale(g_ptr_array_index(list, i - 1));
+
+ screen_browser_paint_directory(w, width, selected, p);
+ g_free(q);
+}
+
static void
screen_artist_paint(void)
{
if (browser.filelist) {
- list_window_paint(browser.lw, browser_lw_callback,
- browser.filelist);
+ screen_browser_paint(&browser);
} else if (album_list != NULL)
- list_window_paint(browser.lw, screen_artist_lw_callback,
- album_list);
+ list_window_paint2(browser.lw,
+ paint_album_callback, album_list);
else if (artist_list != NULL)
- list_window_paint(browser.lw, screen_artist_lw_callback,
- artist_list);
+ list_window_paint2(browser.lw,
+ paint_artist_callback, artist_list);
else {
wmove(browser.lw->w, 0, 0);
wclrtobot(browser.lw->w);
case LIST_SONGS:
s1 = utf8_to_locale(artist);
- if (*album != 0) {
- s2 = utf8_to_locale(album);
+
+ if (album == ALL_TRACKS)
g_snprintf(str, size,
- _("Album: %s - %s"), s1, s2);
+ _("All tracks of artist: %s"), s1);
+ else 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);
+ _("Tracks of no album of artist: %s"), s1);
g_free(s1);
break;
}
/* the db has changed -> update the list */
reload_lists(c);
-#ifndef NCMPC_MINI
- if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_PLAYLIST))
+ if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_QUEUE))
screen_browser_sync_highlights(browser.filelist, &c->playlist);
-#endif
if (c->events & (MPD_IDLE_DATABASE
#ifndef NCMPC_MINI
- | MPD_IDLE_PLAYLIST
+ | MPD_IDLE_QUEUE
#endif
))
artist_repaint();
char *str;
struct filelist *addlist;
- assert(filter != NULL);
+ assert(_filter != NULL);
+
+ if (connection == NULL)
+ return;
str = utf8_to_locale(_filter);
if (table == MPD_TAG_ALBUM)
- screen_status_printf("Adding album %s...", str);
+ screen_status_printf(_("Adding album %s..."), str);
else
- screen_status_printf("Adding %s...", str);
+ screen_status_printf(_("Adding %s..."), str);
g_free(str);
mpd_search_db_songs(connection, true);
mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
table, _filter);
+ if (table == MPD_TAG_ALBUM)
+ mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT,
+ MPD_TAG_ARTIST, artist);
mpd_search_commit(connection);
addlist = filelist_new_recv(connection);
static bool
screen_artist_cmd(struct mpdclient *c, command_t cmd)
{
+ struct list_window_range range;
char *selected;
char *old;
+ char *old_ptr;
int idx;
switch(cmd) {
}
} else if (browser.lw->selected == album_list->len + 1) {
/* handle "show all" */
- open_song_list(c, g_strdup(artist), g_strdup("\0"));
+ open_song_list(c, g_strdup(artist), ALL_TRACKS);
list_window_reset(browser.lw);
} else {
/* select album */
if (browser.lw->selected == 0) {
/* handle ".." */
old = g_strdup(album);
+ old_ptr = album;
open_album_list(c, g_strdup(artist));
list_window_reset(browser.lw);
/* restore previous list window state */
- idx = *old == 0
+ idx = old_ptr == ALL_TRACKS
? (int)album_list->len
: string_array_find(album_list, old);
g_free(old);
case LIST_SONGS:
old = g_strdup(album);
+ old_ptr = album;
open_album_list(c, g_strdup(artist));
list_window_reset(browser.lw);
/* restore previous list window state */
- idx = *old == 0
+ idx = old_ptr == ALL_TRACKS
? (int)album_list->len
: string_array_find(album_list, old);
g_free(old);
if (browser.lw->selected >= artist_list->len)
return true;
- for (unsigned i = browser.lw->selected_start;
- i <= browser.lw->selected_end; ++i) {
+ list_window_get_range(browser.lw, &range);
+ for (unsigned i = range.start; i < range.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:
- for (unsigned i = browser.lw->selected_start;
- i <= browser.lw->selected_end; ++i) {
+ list_window_get_range(browser.lw, &range);
+ for (unsigned i = range.start; i < range.end; ++i) {
if(i == album_list->len + 1)
add_query(c, MPD_TAG_ARTIST, artist);
else if (i > 0)
switch (mode) {
case LIST_ARTISTS:
screen_jump(browser.lw, screen_artist_lw_callback,
- artist_list);
+ paint_artist_callback, artist_list);
artist_repaint();
return true;
case LIST_ALBUMS:
screen_jump(browser.lw, screen_artist_lw_callback,
- album_list);
+ paint_album_callback, album_list);
artist_repaint();
return true;