![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index c9c6f9b019a1acc4e569f8aebe8cc07d361f2796..3b14e6bd7a90b0db0b45154bed930e25909fba31 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
/* 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 void *data)
{
GPtrArray *list = data;
static char buf[BUFSIZE];
@@ -94,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();
}
+#ifndef NCMPC_MINI
/* the playlist have 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)
}
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) {
+#ifndef NCMPC_MINI
if (c != NULL)
mpdclient_remove_playlist_callback(c, playlist_changed_callback);
+#endif
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_TABLE_ARTIST,
+ artist);
+ else
browser.filelist =
- mpdclient_filelist_search_utf8(c, TRUE,
- MPD_TABLE_ALBUM,
- album);
+ mpdclient_filelist_search(c, TRUE,
+ MPD_TABLE_ALBUM,
+ album);
if (browser.filelist == NULL)
browser.filelist = filelist_new(NULL);
/* 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
/* 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");
reload_lists(c);
break;
default:
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;
}
{
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;
}
static void
-paint(mpd_unused mpdclient_t *c)
+paint(void)
{
if (browser.filelist) {
list_window_paint(browser.lw, browser_lw_callback,
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;
}
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(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)
+{
+ 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(mpdclient_t *c, command_t cmd)
{
char *selected;
- int ret;
+ 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();
- break;
+ 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();
- break;
+ return true;
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();
- } else
- browser_handle_enter(&browser, c);
+ return true;
+ }
break;
}
- return 1;
-
+ break;
/* FIXME? CMD_GO_* handling duplicates code from CMD_PLAY */
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_TABLE_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_TABLE_ARTIST, artist);
+ else if (i > 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... */
+ }
}
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:
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,
+ screen_find(browser.lw, artist_list->len,
cmd, artist_lw_callback, artist_list);
- break;
+ artist_repaint();
+ return true;
case LIST_ALBUMS:
- screen_find(screen,
- browser.lw, album_list->len + 2,
+ screen_find(browser.lw, album_list->len + 2,
cmd, artist_lw_callback, album_list);
- break;
+ artist_repaint();
+ return true;
case LIST_SONGS:
- screen_find(screen,
- browser.lw,
- filelist_length(browser.filelist),
- cmd, browser_lw_callback,
- browser.filelist);
+ /* handled by browser_cmd() */
break;
}
- artist_repaint();
- return 1;
-
- case CMD_MOUSE_EVENT:
- return browser_handle_mouse_event(&browser, c);
+ break;
default:
break;
}
- if (artist_lw_cmd(cmd)) {
- artist_repaint();
- return 1;
+ 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 = {