![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index 0593fee3c45369e0ceb0aff6bb04aa41616f9dd2..b331015e25b9d2599d76ecda14fb814cb15221f3 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 "filelist.h"
#include <ctype.h>
#include <stdlib.h>
#include <string.h>
#include <glib.h>
-#include <ncurses.h>
#define BUFSIZE 1024
/* list_window callback */
static const char *
-artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *data)
+screen_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];
@@ -94,31 +95,15 @@ artist_lw_callback(unsigned idx, mpd_unused int *highlight, mpd_unused void *dat
}
static void
-paint(mpdclient_t *c);
+screen_artist_paint(void);
static void
artist_repaint(void)
{
- paint(NULL);
+ screen_artist_paint();
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)
-{
- browser_playlist_changed(&browser, c, event, data);
-
- artist_repaint_if_active();
-}
-
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 (artist_list != NULL) {
string_array_free(artist_list);
}
if (browser.filelist) {
- if (c != NULL)
- mpdclient_remove_playlist_callback(c, playlist_changed_callback);
filelist_free(browser.filelist);
browser.filelist = 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);
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);
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);
- /* install playlist callback and fix highlights */
+#ifndef NCMPC_MINI
+ /* fix highlights */
sync_highlights(c, browser.filelist);
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
+#endif
}
static void
}
}
-/* db updated */
-static void
-browse_callback(mpdclient_t *c, int event, mpd_unused gpointer data)
-{
- switch(event) {
- case BROWSE_DB_UPDATED:
- reload_lists(c);
- break;
- default:
- break;
- }
-
- artist_repaint_if_active();
-}
-
static void
-init(WINDOW *w, int cols, int rows)
+screen_artist_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)
+screen_artist_quit(void)
{
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)
+screen_artist_open(struct mpdclient *c)
{
- static gboolean callback_installed = FALSE;
-
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
-resize(int cols, int rows)
+screen_artist_resize(int cols, int rows)
{
browser.lw->cols = cols;
browser.lw->rows = rows;
}
static void
-paint(mpd_unused mpdclient_t *c)
+screen_artist_paint(void)
{
if (browser.filelist) {
list_window_paint(browser.lw, browser_lw_callback,
browser.filelist);
} else if (album_list != NULL)
- list_window_paint(browser.lw, artist_lw_callback, album_list);
+ list_window_paint(browser.lw, screen_artist_lw_callback,
+ album_list);
else if (artist_list != NULL)
- list_window_paint(browser.lw, artist_lw_callback, artist_list);
+ list_window_paint(browser.lw, screen_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)
+screen_artist_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)
+screen_artist_update(struct mpdclient *c)
+{
+ if (browser.filelist == NULL)
+ return;
+
+ if (c->events & MPD_IDLE_DATABASE)
+ /* the db has changed -> update the list */
+ reload_lists(c);
+
+#ifndef NCMPC_MINI
+ if (c->events & (MPD_IDLE_DATABASE | MPD_IDLE_PLAYLIST))
+ sync_highlights(c, browser.filelist);
+#endif
+
+ if (c->events & (MPD_IDLE_DATABASE
+#ifndef NCMPC_MINI
+ | MPD_IDLE_PLAYLIST
+#endif
+ ))
+ artist_repaint();
+}
+
+static void
+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);
filelist_free(addlist);
}
static int
-artist_lw_cmd(struct screen *screen, struct mpdclient *c, command_t cmd)
+screen_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 browser_cmd(&browser, screen, c, 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)
+{
+ 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
+screen_artist_cmd(struct mpdclient *c, command_t cmd)
{
char *selected;
+ char *old;
+ int idx;
switch(cmd) {
case CMD_PLAY:
selected = g_ptr_array_index(artist_list,
browser.lw->selected);
open_album_list(c, g_strdup(selected));
- list_window_push_state(browser.lw_state, browser.lw);
+ list_window_reset(browser.lw);
artist_repaint();
return true;
case LIST_ALBUMS:
if (browser.lw->selected == 0) {
/* handle ".." */
+ 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);
+ }
} else if (browser.lw->selected == album_list->len + 1) {
/* handle "show all" */
open_song_list(c, g_strdup(artist), g_strdup("\0"));
- list_window_push_state(browser.lw_state, browser.lw);
+ list_window_reset(browser.lw);
} else {
/* select album */
selected = g_ptr_array_index(album_list,
browser.lw->selected - 1);
open_song_list(c, g_strdup(artist), g_strdup(selected));
- list_window_push_state(browser.lw_state, browser.lw);
+ list_window_reset(browser.lw);
}
artist_repaint();
case LIST_SONGS:
if (browser.lw->selected == 0) {
/* handle ".." */
+ 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);
+ }
artist_repaint();
return true;
break;
case LIST_ALBUMS:
+ 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:
+ 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;
}
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(artist_list,
- 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 == album_list->len + 1)
- add_query(c, MPD_TABLE_ARTIST, artist);
- else if (browser.lw->selected > 0) {
- selected = g_ptr_array_index(album_list,
- 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:
/* handled by browser_cmd() */
/* continue and update... */
case CMD_SCREEN_UPDATE:
reload_lists(c);
- screen_status_printf(_("Screen updated!"));
- return 0;
+ return false;
case CMD_LIST_FIND:
case CMD_LIST_RFIND:
case CMD_LIST_RFIND_NEXT:
switch (mode) {
case LIST_ARTISTS:
- screen_find(screen,
- browser.lw, artist_list->len,
- cmd, artist_lw_callback, artist_list);
+ screen_find(browser.lw, artist_list->len,
+ cmd, screen_artist_lw_callback,
+ artist_list);
+ artist_repaint();
+ return true;
+
+ case LIST_ALBUMS:
+ screen_find(browser.lw, album_list->len + 2,
+ cmd, screen_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, screen_artist_lw_callback,
+ artist_list);
artist_repaint();
- return 1;
+ return true;
case LIST_ALBUMS:
- screen_find(screen,
- browser.lw, album_list->len + 2,
- cmd, artist_lw_callback, album_list);
+ screen_jump(browser.lw, screen_artist_lw_callback,
+ album_list);
artist_repaint();
- return 1;
+ return true;
case LIST_SONGS:
/* handled by browser_cmd() */
break;
}
- if (artist_lw_cmd(screen, c, cmd)) {
- artist_repaint();
- return 1;
+ if (screen_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 = {
- .init = init,
- .exit = quit,
- .open = open,
- .resize = resize,
- .paint = paint,
- .cmd = artist_cmd,
- .get_title = get_title,
+ .init = screen_artist_init,
+ .exit = screen_artist_quit,
+ .open = screen_artist_open,
+ .resize = screen_artist_resize,
+ .paint = screen_artist_paint,
+ .update = screen_artist_update,
+ .cmd = screen_artist_cmd,
+ .get_title = screen_artist_get_title,
};