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 35db917762e1ec76f1dfaa094edc7091d760baac..7180c38edd39f2d8fee3b6e7dc47c38a4cc56d0f 100644 (file)
--- a/src/screen_artist.c
+++ b/src/screen_artist.c
@@ -26,7 +26,6 @@
 #include "screen.h"
 #include "screen_utils.h"
 #include "screen_browser.h"
-#include "gcc.h"
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -60,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];
@@ -109,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)
@@ -117,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)
@@ -147,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);
@@ -160,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;
        }
@@ -179,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);
 
@@ -197,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);
 
@@ -228,9 +232,11 @@ load_song_list(struct mpdclient *c)
        /* 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
@@ -301,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:
@@ -461,7 +467,7 @@ string_array_find(GPtrArray *array, const char *value)
        return -1;
 }
 
-static int
+static bool
 artist_cmd(mpdclient_t *c, command_t cmd)
 {
        char *selected;
@@ -631,8 +637,7 @@ artist_cmd(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:
@@ -643,13 +648,13 @@ artist_cmd(mpdclient_t *c, command_t cmd)
                        screen_find(browser.lw, artist_list->len,
                                    cmd, artist_lw_callback, artist_list);
                        artist_repaint();
-                       return 1;
+                       return true;
 
                case LIST_ALBUMS:
                        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() */
@@ -663,11 +668,12 @@ artist_cmd(mpdclient_t *c, command_t cmd)
        }
 
        if (artist_lw_cmd(c, cmd)) {
-               artist_repaint();
-               return 1;
+               if (screen_is_visible(&screen_artist))
+                       artist_repaint();
+               return true;
        }
 
-       return 0;
+       return false;
 }
 
 const struct screen_functions screen_artist = {