p
/
nncmpp
1
1
Fork 0
Code Issues Pull Requests Releases 8 Wiki Activity

Clean up unreadable code

This commit is contained in:
Přemysl Eric Janouch 2021-12-07 20:07:42 +01:00
parent 1a671dfad5
commit f5b5cec340
Signed by: p
GPG Key ID: A0420B94F92B9493
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
nncmpp.c
View File

@ -154,6 +154,8 @@ xbasename (const char *path)
return last_slash ? last_slash + 1 : path; return last_slash ? last_slash + 1 : path;
} }
static char *xstrdup0 (const char *s) { return s ? xstrdup (s) : NULL; }
static char * static char *
latin1_to_utf8 (const char *latin1) latin1_to_utf8 (const char *latin1)
{ {
@ -4364,7 +4366,7 @@ mpd_find_pos_of_id (const char *desired_id)
return -1; return -1;
} }
static char * static const char *
mpd_id_of_pos (int pos) mpd_id_of_pos (int pos)
{ {
compact_map_t map = item_list_get (&g.playlist, pos); compact_map_t map = item_list_get (&g.playlist, pos);
@ -4374,24 +4376,21 @@ mpd_id_of_pos (int pos)
static void static void
mpd_process_info (const struct strv *data) mpd_process_info (const struct strv *data)
{ {
int *selected = &g_current_tab.item_selected; char *prev_sel_id = xstrdup0 (mpd_id_of_pos (g_current_tab.item_selected));
int *marked = &g_current_tab.item_mark; char *prev_mark_id = xstrdup0 (mpd_id_of_pos (g_current_tab.item_mark));
char *prev_sel_id = mpd_id_of_pos (*selected);
char *prev_mark_id = mpd_id_of_pos (*marked);
if (prev_sel_id) prev_sel_id = xstrdup (prev_sel_id);
if (prev_mark_id) prev_mark_id = xstrdup (prev_mark_id);
mpd_process_info_data (data); mpd_process_info_data (data);
const char *sel_id = mpd_id_of_pos (*selected); const char *sel_id = mpd_id_of_pos (g_current_tab.item_selected);
const char *mark_id = mpd_id_of_pos (*marked); const char *mark_id = mpd_id_of_pos (g_current_tab.item_mark);
if (prev_mark_id && (!mark_id || strcmp (prev_mark_id, mark_id))) if (prev_mark_id && (!mark_id || strcmp (prev_mark_id, mark_id)))
*marked = mpd_find_pos_of_id (prev_mark_id); g_current_tab.item_mark = mpd_find_pos_of_id (prev_mark_id);
if (prev_sel_id && (!sel_id || strcmp (prev_sel_id, sel_id))) if (prev_sel_id && (!sel_id || strcmp (prev_sel_id, sel_id)))
{ {
if ((*selected = mpd_find_pos_of_id (prev_sel_id)) < 0) g_current_tab.item_selected = mpd_find_pos_of_id (prev_sel_id);
*marked = -1; if (g_current_tab.item_selected < 0)
g_current_tab.item_mark = -1;
app_move_selection (0); app_move_selection (0);
} }