screen_artist: fixes for the ncmpc-mini build

[ncmpc.git] / src / screen_artist.c

diff --git a/src/screen_artist.c b/src/screen_artist.c
index 86291d87de633712542f7459a5a329d682ba919b..7180c38edd39f2d8fee3b6e7dc47c38a4cc56d0f 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -26,13 +26,11 @@
 #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
 
@@ -61,7 +59,8 @@ compare_utf8(gconstpointer s1, gconstpointer s2)
 
 /* 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 int *highlight,
+                  G_GNUC_UNUSED void *data)
 {
        GPtrArray *list = data;
        static char buf[BUFSIZE];
@@ -94,12 +93,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);
 }
 
@@ -110,6 +109,7 @@ artist_repaint_if_active(void)
                artist_repaint();
 }
 
+#ifndef NCMPC_MINI
 /* the playlist have been updated -> fix highlights */
 static void
 playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
@@ -118,6 +118,7 @@ playlist_changed_callback(mpdclient_t *c, int event, gpointer data)
 
        artist_repaint_if_active();
 }
+#endif
 
 static GPtrArray *
 g_list_to_ptr_array(GList *in)
@@ -148,7 +149,7 @@ string_array_free(GPtrArray *array)
 }
 
 static void
-free_lists(struct mpdclient *c)
+free_lists(G_GNUC_UNUSED struct mpdclient *c)
 {
        if (artist_list != NULL) {
                string_array_free(artist_list);
@@ -161,8 +162,10 @@ free_lists(struct mpdclient *c)
        }
 
        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;
        }
@@ -180,7 +183,7 @@ load_artist_list(struct mpdclient *c)
        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);
 
@@ -198,7 +201,7 @@ load_album_list(struct mpdclient *c)
        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);
 
@@ -215,23 +218,25 @@ load_song_list(struct mpdclient *c)
 
        if (album[0] == 0)
                browser.filelist =
-                       mpdclient_filelist_search_utf8(c, TRUE,
-                                                      MPD_TABLE_ARTIST,
-                                                      artist);
+                       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
@@ -302,7 +307,7 @@ reload_lists(struct mpdclient *c)
 
 /* 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:
@@ -331,7 +336,7 @@ quit(void)
 }
 
 static void
-open(mpd_unused screen_t *screen, mpdclient_t *c)
+open(mpdclient_t *c)
 {
        static gboolean callback_installed = FALSE;
 
@@ -352,7 +357,7 @@ resize(int cols, int rows)
 }
 
 static void
-paint(mpd_unused mpdclient_t *c)
+paint(void)
 {
        if (browser.filelist) {
                list_window_paint(browser.lw, browser_lw_callback,
@@ -415,7 +420,7 @@ add_query(mpdclient_t *c, int table, char *_filter)
                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);
@@ -434,7 +439,7 @@ metalist_length(void)
 }
 
 static int
-artist_lw_cmd(struct screen *screen, struct mpdclient *c, command_t cmd)
+artist_lw_cmd(struct mpdclient *c, command_t cmd)
 {
        switch (mode) {
        case LIST_ARTISTS:
@@ -442,7 +447,7 @@ artist_lw_cmd(struct screen *screen, struct mpdclient *c, command_t cmd)
                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);
@@ -462,8 +467,8 @@ string_array_find(GPtrArray *array, const char *value)
        return -1;
 }
 
-static int
-artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
+static bool
+artist_cmd(mpdclient_t *c, command_t cmd)
 {
        char *selected;
        char *old;
@@ -632,8 +637,7 @@ artist_cmd(screen_t *screen, mpdclient_t *c, command_t 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:
@@ -641,18 +645,16 @@ artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
        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);
                        artist_repaint();
-                       return 1;
+                       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);
                        artist_repaint();
-                       return 1;
+                       return true;
 
                case LIST_SONGS:
                        /* handled by browser_cmd() */
@@ -665,12 +667,13 @@ artist_cmd(screen_t *screen, mpdclient_t *c, command_t cmd)
                break;
        }
 
-       if (artist_lw_cmd(screen, c, 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 = {