diff --git a/src/screen.c b/src/screen.c
index 4050add277367c224a45b949ffc010a9e8a73b0d..6f1ac95f3bab6f4eac1d55b24021ed3841703dfc 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
/* 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
screen_next_mode(struct mpdclient *c, int offset)
{
int max = g_strv_length(options.screen_list);
- int current, next;
- const struct screen_functions *sf;
/* find current screen */
- current = find_configured_screen(screen_get_name(mode_fn));
- next = current + offset;
+ int current = find_configured_screen(screen_get_name(mode_fn));
+ int next = current + offset;
if (next<0)
next = max-1;
else if (next>=max)
next = 0;
- sf = screen_lookup_name(options.screen_list[next]);
+ const struct screen_functions *sf =
+ screen_lookup_name(options.screen_list[next]);
if (sf != NULL)
screen_switch(sf, c);
}
static void
update_progress_window(struct mpdclient *c, bool repaint)
{
- unsigned elapsed, duration;
-
+ unsigned elapsed;
if (c->status == NULL)
elapsed = 0;
else if (seek_id >= 0 && seek_id == mpd_status_get_song_id(c->status))
else
elapsed = mpd_status_get_elapsed_time(c->status);
- duration = mpdclient_is_playing(c)
+ unsigned duration = mpdclient_is_playing(c)
? mpd_status_get_total_time(c->status)
: 0;