X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_artist.c;h=f8d50d0c096def9358075320d970d75811e12992;hb=e52df3dd5be37471c4fceceb683479bd81bdec27;hp=5d77c1080396419fe75f2aa736df2c7db0c0ed12;hpb=fecd8b0432be12738335ee3cd624518a3df7b95f;p=ncmpc.git diff --git a/src/screen_artist.c b/src/screen_artist.c index 5d77c10..f8d50d0 100644 --- a/src/screen_artist.c +++ b/src/screen_artist.c @@ -1,25 +1,25 @@ /* ncmpc (Ncurses MPD Client) - * (c) 2004-2010 The Music Player Daemon Project + * (c) 2004-2017 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., * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -*/ + */ #include "screen_artist.h" #include "screen_interface.h" -#include "screen_message.h" +#include "screen_status.h" #include "screen_find.h" #include "screen_browser.h" #include "screen.h" @@ -28,6 +28,7 @@ #include "mpdclient.h" #include "screen_browser.h" #include "filelist.h" +#include "options.h" #include #include @@ -49,12 +50,10 @@ static gint compare_utf8(gconstpointer s1, gconstpointer s2) { const char *const*t1 = s1, *const*t2 = s2; - char *key1, *key2; - int n; - key1 = g_utf8_collate_key(*t1,-1); - key2 = g_utf8_collate_key(*t2,-1); - n = strcmp(key1,key2); + char *key1 = g_utf8_collate_key(*t1,-1); + char *key2 = g_utf8_collate_key(*t2,-1); + int n = strcmp(key1,key2); g_free(key1); g_free(key2); return n; @@ -65,8 +64,6 @@ static const char * screen_artist_lw_callback(unsigned idx, void *data) { GPtrArray *list = data; - static char buf[BUFSIZE]; - char *str, *str_utf8; if (mode == LIST_ALBUMS) { if (idx == 0) @@ -79,32 +76,22 @@ screen_artist_lw_callback(unsigned idx, void *data) assert(idx < list->len); - str_utf8 = g_ptr_array_index(list, idx); + char *str_utf8 = g_ptr_array_index(list, idx); assert(str_utf8 != NULL); - str = utf8_to_locale(str_utf8); + char *str = utf8_to_locale(str_utf8); + + static char buf[BUFSIZE]; g_strlcpy(buf, str, sizeof(buf)); g_free(str); return buf; } -static void -screen_artist_paint(void); - -static void -artist_repaint(void) -{ - screen_artist_paint(); - wrefresh(browser.lw->w); -} - static void string_array_free(GPtrArray *array) { - unsigned i; - - for (i = 0; i < array->len; ++i) { + for (unsigned i = 0; i < array->len; ++i) { char *value = g_ptr_array_index(array, i); g_free(value); } @@ -162,8 +149,7 @@ load_artist_list(struct mpdclient *c) mpd_search_commit(connection); recv_tag_values(connection, MPD_TAG_ARTIST, artist_list); - if (!mpd_response_finish(connection)) - mpdclient_handle_error(c); + mpdclient_finish_command(c); } /* sort list */ @@ -193,8 +179,7 @@ load_album_list(struct mpdclient *c) recv_tag_values(connection, MPD_TAG_ALBUM, album_list); - if (!mpd_response_finish(connection)) - mpdclient_handle_error(c); + mpdclient_finish_command(c); } /* sort list */ @@ -228,8 +213,7 @@ load_song_list(struct mpdclient *c) filelist_recv(browser.filelist, connection); - if (!mpd_response_finish(connection)) - mpdclient_handle_error(c); + mpdclient_finish_command(c); } /* fix highlights */ @@ -308,6 +292,7 @@ static void screen_artist_init(WINDOW *w, int cols, int rows) { browser.lw = list_window_init(w, cols, rows); + browser.song_format = options.list_format; artist = NULL; album = NULL; } @@ -338,10 +323,10 @@ screen_artist_resize(int cols, int rows) */ static void paint_artist_callback(WINDOW *w, unsigned i, - G_GNUC_UNUSED unsigned y, unsigned width, - bool selected, void *data) + gcc_unused unsigned y, unsigned width, + bool selected, const void *data) { - GPtrArray *list = data; + const GPtrArray *list = data; char *p = utf8_to_locale(g_ptr_array_index(list, i)); screen_browser_paint_directory(w, width, selected, p); @@ -356,10 +341,10 @@ paint_artist_callback(WINDOW *w, unsigned i, */ static void paint_album_callback(WINDOW *w, unsigned i, - G_GNUC_UNUSED unsigned y, unsigned width, - bool selected, void *data) + gcc_unused unsigned y, unsigned width, + bool selected, const void *data) { - GPtrArray *list = data; + const GPtrArray *list = data; const char *p; char *q = NULL; @@ -394,9 +379,9 @@ screen_artist_paint(void) static const char * screen_artist_get_title(char *str, size_t size) { - char *s1, *s2; - switch(mode) { + char *s1, *s2; + case LIST_ARTISTS: g_snprintf(str, size, _("All artists")); break; @@ -445,26 +430,28 @@ screen_artist_update(struct mpdclient *c) | MPD_IDLE_QUEUE #endif )) - artist_repaint(); + screen_artist_paint(); } +/* add_query - Add all songs satisfying specified criteria. + _artist is actually only used in the ALBUM case to distinguish albums with + the same name from different artists. */ static void -add_query(struct mpdclient *c, enum mpd_tag_type table, char *_filter) +add_query(struct mpdclient *c, enum mpd_tag_type table, const char *_filter, + const char *_artist) { struct mpd_connection *connection = mpdclient_get_connection(c); - char *str; - struct filelist *addlist; - assert(filter != NULL); + assert(_filter != NULL); if (connection == NULL) return; - str = utf8_to_locale(_filter); + char *str = utf8_to_locale(_filter); if (table == MPD_TAG_ALBUM) - screen_status_printf("Adding album %s...", str); + screen_status_printf(_("Adding album %s..."), str); else - screen_status_printf("Adding %s...", str); + screen_status_printf(_("Adding %s..."), str); g_free(str); mpd_search_db_songs(connection, true); @@ -472,15 +459,13 @@ add_query(struct mpdclient *c, enum mpd_tag_type table, char *_filter) table, _filter); if (table == MPD_TAG_ALBUM) mpd_search_add_tag_constraint(connection, MPD_OPERATOR_DEFAULT, - MPD_TAG_ARTIST, artist); + MPD_TAG_ARTIST, _artist); mpd_search_commit(connection); - addlist = filelist_new_recv(connection); + struct filelist *addlist = filelist_new_recv(connection); - if (mpd_response_finish(connection)) + if (mpdclient_finish_command(c)) mpdclient_filelist_add_all(c, addlist); - else - mpdclient_handle_error(c); filelist_free(addlist); } @@ -517,13 +502,13 @@ string_array_find(GPtrArray *array, const char *value) static bool screen_artist_cmd(struct mpdclient *c, command_t cmd) { - struct list_window_range range; - char *selected; - char *old; - char *old_ptr; - int idx; - switch(cmd) { + struct list_window_range range; + char *selected; + char *old; + char *old_ptr; + int idx; + case CMD_PLAY: switch (mode) { case LIST_ARTISTS: @@ -535,7 +520,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) open_album_list(c, g_strdup(selected)); list_window_reset(browser.lw); - artist_repaint(); + screen_artist_paint(); return true; case LIST_ALBUMS: @@ -565,7 +550,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) list_window_reset(browser.lw); } - artist_repaint(); + screen_artist_paint(); return true; case LIST_SONGS: @@ -588,7 +573,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) list_window_center(browser.lw, idx); } - artist_repaint(); + screen_artist_paint(); return true; } break; @@ -637,7 +622,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) break; } - artist_repaint(); + screen_artist_paint(); break; case CMD_GO_ROOT_DIRECTORY: @@ -654,7 +639,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) break; } - artist_repaint(); + screen_artist_paint(); break; case CMD_SELECT: @@ -667,7 +652,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) list_window_get_range(browser.lw, &range); for (unsigned i = range.start; i < range.end; ++i) { selected = g_ptr_array_index(artist_list, i); - add_query(c, MPD_TAG_ARTIST, selected); + add_query(c, MPD_TAG_ARTIST, selected, NULL); cmd = CMD_LIST_NEXT; /* continue and select next item... */ } break; @@ -676,12 +661,12 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) list_window_get_range(browser.lw, &range); for (unsigned i = range.start; i < range.end; ++i) { if(i == album_list->len + 1) - add_query(c, MPD_TAG_ARTIST, artist); + add_query(c, MPD_TAG_ARTIST, artist, NULL); else if (i > 0) { selected = g_ptr_array_index(album_list, browser.lw->selected - 1); - add_query(c, MPD_TAG_ALBUM, selected); + add_query(c, MPD_TAG_ALBUM, selected, artist); cmd = CMD_LIST_NEXT; /* continue and select next item... */ } } @@ -706,13 +691,13 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) case LIST_ARTISTS: screen_find(browser.lw, cmd, screen_artist_lw_callback, artist_list); - artist_repaint(); + screen_artist_paint(); return true; case LIST_ALBUMS: screen_find(browser.lw, cmd, screen_artist_lw_callback, album_list); - artist_repaint(); + screen_artist_paint(); return true; case LIST_SONGS: @@ -722,15 +707,17 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) case CMD_LIST_JUMP: switch (mode) { case LIST_ARTISTS: - screen_jump(browser.lw, screen_artist_lw_callback, + screen_jump(browser.lw, + screen_artist_lw_callback, artist_list, paint_artist_callback, artist_list); - artist_repaint(); + screen_artist_paint(); return true; case LIST_ALBUMS: - screen_jump(browser.lw, screen_artist_lw_callback, + screen_jump(browser.lw, + screen_artist_lw_callback, album_list, paint_album_callback, album_list); - artist_repaint(); + screen_artist_paint(); return true; case LIST_SONGS: @@ -746,7 +733,7 @@ screen_artist_cmd(struct mpdclient *c, command_t cmd) if (screen_artist_lw_cmd(c, cmd)) { if (screen_is_visible(&screen_artist)) - artist_repaint(); + screen_artist_paint(); return true; }