![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/screen_artist.c b/src/screen_artist.c
index be32dacb4ba7f0c7e20ef25d6f686f193c9cd335..b331015e25b9d2599d76ecda14fb814cb15221f3 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
#include "screen.h"
#include "screen_utils.h"
#include "screen_browser.h"
+#include "filelist.h"
#include <ctype.h>
#include <stdlib.h>
/* list_window callback */
static const char *
-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, G_GNUC_UNUSED bool *highlight,
+ G_GNUC_UNUSED char** sc, G_GNUC_UNUSED void *data)
{
GPtrArray *list = data;
static char buf[BUFSIZE];
}
static void
-paint(void);
+screen_artist_paint(void);
static void
artist_repaint(void)
{
- paint();
+ screen_artist_paint();
wrefresh(browser.lw->w);
}
-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(mpdclient_t *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)
{
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);
}
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;
}
if (album[0] == 0)
browser.filelist =
mpdclient_filelist_search(c, TRUE,
- MPD_TABLE_ARTIST,
+ MPD_TAG_ARTIST,
artist);
else
browser.filelist =
mpdclient_filelist_search(c, TRUE,
- MPD_TABLE_ALBUM,
+ 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 */
+ /* fix highlights */
sync_highlights(c, browser.filelist);
- mpdclient_install_playlist_callback(c, playlist_changed_callback);
#endif
}
}
}
-/* db updated */
-static void
-browse_callback(mpdclient_t *c, int event, G_GNUC_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);
artist = NULL;
}
static void
-quit(void)
+screen_artist_quit(void)
{
free_state(NULL);
list_window_free(browser.lw);
}
static void
-open(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(void)
+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, *s2;
}
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);
}
static int
-artist_lw_cmd(struct mpdclient *c, command_t cmd)
+screen_artist_lw_cmd(struct mpdclient *c, command_t cmd)
{
switch (mode) {
case LIST_ARTISTS:
}
static bool
-artist_cmd(mpdclient_t *c, command_t cmd)
+screen_artist_cmd(struct mpdclient *c, command_t cmd)
{
char *selected;
char *old;
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);
+ add_query(c, MPD_TAG_ARTIST, selected);
cmd = CMD_LIST_NEXT; /* continue and select next item... */
}
break;
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);
+ 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_TABLE_ALBUM, selected);
+ add_query(c, MPD_TAG_ALBUM, selected);
cmd = CMD_LIST_NEXT; /* continue and select next item... */
}
}
switch (mode) {
case LIST_ARTISTS:
screen_find(browser.lw, artist_list->len,
- cmd, artist_lw_callback, artist_list);
+ cmd, screen_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);
+ cmd, screen_artist_lw_callback,
+ album_list);
artist_repaint();
return true;
case CMD_LIST_JUMP:
switch (mode) {
case LIST_ARTISTS:
- screen_jump(browser.lw, artist_lw_callback, artist_list);
+ screen_jump(browser.lw, screen_artist_lw_callback,
+ artist_list);
artist_repaint();
return true;
case LIST_ALBUMS:
- screen_jump(browser.lw, artist_lw_callback, album_list);
+ screen_jump(browser.lw, screen_artist_lw_callback,
+ album_list);
artist_repaint();
return true;
break;
}
- if (artist_lw_cmd(c, cmd)) {
+ if (screen_artist_lw_cmd(c, cmd)) {
if (screen_is_visible(&screen_artist))
artist_repaint();
return true;
}
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,
};