X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_file.c;h=5399c85d3bfe5c7fed1aea468321e2b8a23e813e;hb=e52df3dd5be37471c4fceceb683479bd81bdec27;hp=da7969b7221d00e1da14d845551bf6f449799a61;hpb=efcebe262a89885328ab1068c1644b38f93ca618;p=ncmpc.git diff --git a/src/screen_file.c b/src/screen_file.c index da7969b..5399c85 100644 --- a/src/screen_file.c +++ b/src/screen_file.c @@ -1,5 +1,5 @@ /* 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 @@ -30,6 +30,7 @@ #include "filelist.h" #include "screen_utils.h" #include "screen_client.h" +#include "options.h" #include @@ -41,16 +42,6 @@ static struct screen_browser browser; static char *current_path; -static void -screen_file_paint(void); - -static void -screen_file_repaint(void) -{ - screen_file_paint(); - wrefresh(browser.lw->w); -} - static void screen_file_load_list(struct mpdclient *c, struct filelist *filelist) { @@ -109,20 +100,16 @@ static bool change_to_parent(struct mpdclient *c) { char *parent = g_path_get_dirname(current_path); - char *old_path; - int idx; - bool success; - if (strcmp(parent, ".") == 0) parent[0] = '\0'; - old_path = current_path; + char *old_path = current_path; current_path = NULL; - success = change_directory(c, parent); + bool success = change_directory(c, parent); g_free(parent); - idx = success + int idx = success ? filelist_find_directory(browser.filelist, old_path) : -1; g_free(old_path); @@ -169,7 +156,6 @@ handle_save(struct mpdclient *c) { struct list_window_range range; const char *defaultname = NULL; - char *defaultname_utf8 = NULL; list_window_get_range(browser.lw, &range); if (range.start == range.end) @@ -188,6 +174,7 @@ handle_save(struct mpdclient *c) } } + char *defaultname_utf8 = NULL; if(defaultname) defaultname_utf8 = utf8_to_locale(defaultname); playlist_save(c, NULL, defaultname_utf8); @@ -198,14 +185,11 @@ static void handle_delete(struct mpdclient *c) { struct mpd_connection *connection = mpdclient_get_connection(c); - struct list_window_range range; - struct mpd_entity *entity; - const struct mpd_playlist *playlist; - char *str, *buf; if (connection == NULL) return; + struct list_window_range range; list_window_get_range(browser.lw, &range); for (unsigned i = range.start; i < range.end; ++i) { struct filelist_entry *entry = @@ -213,7 +197,7 @@ handle_delete(struct mpdclient *c) if( entry==NULL || entry->entity==NULL ) continue; - entity = entry->entity; + struct mpd_entity *entity = entry->entity; if (mpd_entity_get_type(entity) != MPD_ENTITY_TYPE_PLAYLIST) { /* translators: the "delete" command is only possible @@ -224,9 +208,9 @@ handle_delete(struct mpdclient *c) continue; } - playlist = mpd_entity_get_playlist(entity); - str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist))); - buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO); + const struct mpd_playlist *playlist = mpd_entity_get_playlist(entity); + char *str = utf8_to_locale(g_basename(mpd_playlist_get_path(playlist))); + char *buf = g_strdup_printf(_("Delete playlist %s [%s/%s] ? "), str, YES, NO); g_free(str); bool delete = screen_get_yesno(buf, false); g_free(buf); @@ -256,6 +240,7 @@ screen_file_init(WINDOW *w, int cols, int rows) current_path = g_strdup(""); browser.lw = list_window_init(w, cols, rows); + browser.song_format = options.list_format; } static void @@ -285,7 +270,6 @@ static const char * screen_file_get_title(char *str, size_t size) { const char *path = NULL, *prev = NULL, *slash = current_path; - char *path_locale; /* determine the last 2 parts of the path */ while ((slash = strchr(slash, '/')) != NULL) { @@ -297,7 +281,7 @@ screen_file_get_title(char *str, size_t size) /* fall back to full path */ path = current_path; - path_locale = utf8_to_locale(path); + char *path_locale = utf8_to_locale(path); g_snprintf(str, size, "%s: %s", /* translators: caption of the browser screen */ _("Browse"), path_locale); @@ -325,7 +309,7 @@ screen_file_update(struct mpdclient *c) #endif )) { screen_browser_sync_highlights(browser.filelist, &c->playlist); - screen_file_repaint(); + screen_file_paint(); } } @@ -335,7 +319,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) switch(cmd) { case CMD_PLAY: if (screen_file_handle_enter(c)) { - screen_file_repaint(); + screen_file_paint(); return true; } @@ -343,11 +327,11 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) case CMD_GO_ROOT_DIRECTORY: change_directory(c, ""); - screen_file_repaint(); + screen_file_paint(); return true; case CMD_GO_PARENT_DIRECTORY: change_to_parent(c); - screen_file_repaint(); + screen_file_paint(); return true; case CMD_LOCATE: @@ -359,7 +343,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) case CMD_SCREEN_UPDATE: screen_file_reload(c); screen_browser_sync_highlights(browser.filelist, &c->playlist); - screen_file_repaint(); + screen_file_paint(); return false; default: @@ -368,7 +352,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) if (browser_cmd(&browser, c, cmd)) { if (screen_is_visible(&screen_browse)) - screen_file_repaint(); + screen_file_paint(); return true; } @@ -378,7 +362,7 @@ screen_file_cmd(struct mpdclient *c, command_t cmd) switch(cmd) { case CMD_DELETE: handle_delete(c); - screen_file_repaint(); + screen_file_paint(); break; case CMD_SAVE_PLAYLIST: @@ -412,8 +396,6 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) { const char *uri, *slash, *parent; char *allocated = NULL; - bool ret; - int i; assert(song != NULL); @@ -431,14 +413,14 @@ screen_file_goto_song(struct mpdclient *c, const struct mpd_song *song) else parent = ""; - ret = change_directory(c, parent); + bool ret = change_directory(c, parent); g_free(allocated); if (!ret) return false; /* select the specified song */ - i = filelist_find_song(browser.filelist, song); + int i = filelist_find_song(browser.filelist, song); if (i < 0) i = 0;