![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 5dbb2c03b55f960837e72c5c082d902d30d057fc..f6de9dde00621d6dbe9b697aeac481e01ebfd4c4 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
-/*
- * (c) 2005 by Kalle Wallin <kaw@linux.se>
- *
+/* 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 "ncmpc.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.
+*/
+
+#include "i18n.h"
#include "options.h"
-#include "support.h"
+#include "charset.h"
#include "mpdclient.h"
#include "utils.h"
#include "strfsong.h"
#include "screen.h"
#include "screen_utils.h"
#include "screen_browser.h"
-#include "gcc.h"
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <ncurses.h>
#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 GPtrArray *metalist = NULL;
static struct screen_browser browser;
/* 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 (mode == LIST_ALBUMS) {
if (idx == 0)
return "[..]";
- else if (idx == metalist->len + 1) {
+ else if (idx == list->len + 1) {
str = utf8_to_locale(_("All tracks"));
g_snprintf(buf, BUFSIZE, "[%s]", str);
g_free(str);
@@ -79,10 +80,10 @@ artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *dat
--idx;
}
- if (idx >= metalist->len)
+ if (idx >= list->len)
return NULL;
- str_utf8 = g_ptr_array_index(metalist, idx);
+ str_utf8 = g_ptr_array_index(list, idx);
assert(str_utf8 != NULL);
str = utf8_to_locale(str_utf8);
@@ -93,12 +94,12 @@ artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *dat
}
static void
-paint(mpdclient_t *c);
+paint(void);
static void
artist_repaint(void)
{
- paint(NULL);
+ paint();
wrefresh(browser.lw->w);
}
artist_repaint();
}
-/* the playlist have been updated -> fix highlights */
+#ifndef NCMPC_MINI
+/* the playlist has been updated -> fix highlights */
static void
playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
{
artist_repaint_if_active();
}
+#endif
static GPtrArray *
g_list_to_ptr_array(GList *in)
for (i = 0; i < array->len; ++i) {
char *value = g_ptr_array_index(array, i);
- free(value);
+ g_free(value);
}
g_ptr_array_free(array, TRUE);
}
static void
-free_lists(struct mpdclient *c)
+free_lists(G_GNUC_UNUSED struct mpdclient *c)
{
- if (metalist != NULL) {
- string_array_free(metalist);
- metalist = NULL;
+ 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;
}
assert(mode == LIST_ARTISTS);
assert(artist == NULL);
assert(album == NULL);
- assert(metalist == NULL);
+ assert(artist_list == NULL);
+ assert(album_list == NULL);
assert(browser.filelist == NULL);
- list = mpdclient_get_artists_utf8(c);
+ list = mpdclient_get_artists(c);
/* sort list */
list = g_list_sort(list, compare_utf8);
- metalist = g_list_to_ptr_array(list);
+ artist_list = g_list_to_ptr_array(list);
}
static void
assert(mode == LIST_ALBUMS);
assert(artist != NULL);
assert(album == NULL);
- assert(metalist == NULL);
+ assert(album_list == NULL);
assert(browser.filelist == NULL);
- list = mpdclient_get_albums_utf8(c, artist);
+ list = mpdclient_get_albums(c, artist);
/* sort list */
list = g_list_sort(list, compare_utf8);
- metalist = g_list_to_ptr_array(list);
+ album_list = g_list_to_ptr_array(list);
}
static void
assert(album != NULL);
assert(browser.filelist == NULL);
- if (album[0] == 0) {
- album = g_strdup(_("All tracks"));
+ if (album[0] == 0)
browser.filelist =
- mpdclient_filelist_search_utf8(c, TRUE,
- MPD_TABLE_ARTIST,
- artist);
- } else
+ mpdclient_filelist_search(c, TRUE,
+ MPD_TAG_ARTIST,
+ artist);
+ else
browser.filelist =
- mpdclient_filelist_search_utf8(c, TRUE,
- MPD_TABLE_ALBUM,
- album);
+ mpdclient_filelist_search(c, TRUE,
+ MPD_TAG_ALBUM,
+ album);
if (browser.filelist == NULL)
- browser.filelist = filelist_new(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
}
-/* fetch artists/albums/songs from mpd */
static void
-update_metalist(mpdclient_t *c, char *m_artist, char *m_album)
+free_state(struct mpdclient *c)
{
g_free(artist);
g_free(album);
album = NULL;
free_lists(c);
+}
- if (m_album) {
- /* retreive songs... */
- artist = m_artist;
- album = m_album;
+static void
+open_artist_list(struct mpdclient *c)
+{
+ free_state(c);
- mode = LIST_SONGS;
- load_song_list(c);
- } else if (m_artist) {
- /* retreive albums... */
- artist = m_artist;
+ mode = LIST_ARTISTS;
+ load_artist_list(c);
+}
- mode = LIST_ALBUMS;
- load_album_list(c);
- } else {
- mode = LIST_ARTISTS;
+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;
}
}
/* db updated */
static void
-browse_callback(mpdclient_t *c, int event, mpd_unused gpointer data)
+browse_callback(mpdclient_t *c, int event, G_GNUC_UNUSED gpointer data)
{
switch(event) {
case BROWSE_DB_UPDATED:
- D("screen_artist.c> browse_callback() [BROWSE_DB_UPDATED]\n");
- update_metalist(c, g_strdup(artist), g_strdup(album));
+ reload_lists(c);
break;
default:
break;
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;
}
static void
quit(void)
{
- free_lists(NULL);
- 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(mpdclient_t *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;
}
static void
-paint(mpd_unused mpdclient_t *c)
+paint(void)
{
if (browser.filelist) {
list_window_paint(browser.lw, browser_lw_callback,
browser.filelist);
- } 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);
}
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(mpdclient_t *c, enum mpd_tag_type table, char *_filter)
{
char *str;
mpdclient_filelist_t *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);
filelist_free(addlist);
static unsigned
metalist_length(void)
{
- assert(metalist != NULL);
+ assert(mode != LIST_ARTISTS || artist_list != NULL);
+ assert(mode != LIST_ALBUMS || album_list != NULL);
return mode == LIST_ALBUMS
- ? metalist->len + 2
- : metalist->len;
+ ? album_list->len + 2
+ : artist_list->len;
}
static int
-artist_lw_cmd(command_t cmd)
+artist_lw_cmd(struct mpdclient *c, command_t cmd)
{
switch (mode) {
case LIST_ARTISTS:
return list_window_cmd(browser.lw, metalist_length(), cmd);
case LIST_SONGS:
- return list_window_cmd(browser.lw,
- filelist_length(browser.filelist),
- cmd);
+ return browser_cmd(&browser, c, cmd);
}
assert(0);
}
static int
-artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+string_array_find(GPtrArray *array, const char *value)
{
- char *selected;
- int ret;
+ guint i;
- if (artist_lw_cmd(cmd)) {
- artist_repaint();
- wrefresh(browser.lw->w);
- return 1;
- }
+ 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(mpdclient_t *c, command_t cmd)
+{
+ char *selected;
+ char *old;
+ int idx;
switch(cmd) {
case CMD_PLAY:
switch (mode) {
case LIST_ARTISTS:
- selected = g_ptr_array_index(metalist,
+ selected = g_ptr_array_index(artist_list,
browser.lw->selected);
- update_metalist(c, g_strdup(selected), NULL);
- list_window_push_state(browser.lw_state, browser.lw);
+ open_album_list(c, g_strdup(selected));
+ list_window_reset(browser.lw);
- list_window_paint(browser.lw, artist_lw_callback, metalist);
- wrefresh(browser.lw->w);
- break;
+ 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->len + 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_ptr_array_index(metalist,
+ selected = g_ptr_array_index(album_list,
browser.lw->selected - 1);
- update_metalist(c, g_strdup(artist), g_strdup(selected));
- list_window_push_state(browser.lw_state, browser.lw);
+ open_song_list(c, g_strdup(artist), g_strdup(selected));
+ list_window_reset(browser.lw);
}
artist_repaint();
- break;
+ 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);
-
- list_window_paint(browser.lw, artist_lw_callback, metalist);
- wrefresh(browser.lw->w);
- } else
- browser_handle_enter(&browser, c);
+ 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 */
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;
}
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;
}
case CMD_ADD:
switch(mode) {
case LIST_ARTISTS:
- selected = g_ptr_array_index(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 == metalist->len + 1)
- add_query(c, MPD_TABLE_ARTIST, artist);
- else if (browser.lw->selected > 0) {
- selected = g_ptr_array_index(metalist,
- browser.lw->selected - 1);
- 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:
- 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;
+ /* handled by browser_cmd() */
break;
}
break;
/* continue and update... */
case CMD_SCREEN_UPDATE:
- 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)
- screen_find(screen,
- browser.lw, filelist_length(browser.filelist),
- cmd, browser_lw_callback,
- browser.filelist);
- else if (metalist)
- screen_find(screen,
- browser.lw, metalist_length(),
- cmd, artist_lw_callback, metalist);
- else
- return 1;
+ switch (mode) {
+ case LIST_ARTISTS:
+ screen_find(browser.lw, artist_list->len,
+ cmd, artist_lw_callback, artist_list);
+ artist_repaint();
+ return true;
- artist_repaint();
- return 1;
+ case LIST_ALBUMS:
+ screen_find(browser.lw, album_list->len + 2,
+ cmd, artist_lw_callback, album_list);
+ artist_repaint();
+ return true;
- case CMD_MOUSE_EVENT:
- return browser_handle_mouse_event(&browser, c);
+ 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;
}
- return 0;
+ if (artist_lw_cmd(c, cmd)) {
+ if (screen_is_visible(&screen_artist))
+ artist_repaint();
+ return true;
+ }
+
+ return false;
}
const struct screen_functions screen_artist = {