README.rst: bug tracking now on GitHub

[ncmpc.git] / src / song_paint.c

diff --git a/src/song_paint.c b/src/song_paint.c
index 0e2e74194383f3fb25f19ce3cf1c8377f3cddb04..56b80a3772fa1dd0e90b15fa1ac28769045f096a 100644 (file)
--- a/src/song_paint.c
+++ b/src/song_paint.c
@@ -1,5 +1,5 @@
 /* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 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
@@ -15,12 +15,12 @@
  * 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 "song_paint.h"
 #include "paint.h"
 #include "strfsong.h"
-#include "utils.h"
+#include "time_format.h"
 #include "hscroll.h"
 #include "charset.h"
 #include "config.h"
@@ -32,18 +32,18 @@
 #include <string.h>
 
 void
-paint_song_row(WINDOW *w, G_GNUC_UNUSED unsigned y, unsigned width,
+paint_song_row(WINDOW *w, gcc_unused unsigned y, unsigned width,
               bool selected, bool highlight, const struct mpd_song *song,
-              G_GNUC_UNUSED struct hscroll *hscroll)
+              gcc_unused struct hscroll *hscroll, const char *format)
 {
        char buffer[width * 4];
 
-       strfsong(buffer, sizeof(buffer), options.list_format, song);
+       strfsong(buffer, sizeof(buffer), format, song);
        row_paint_text(w, width, highlight ? COLOR_LIST_BOLD : COLOR_LIST,
                       selected, buffer);
 
 #ifndef NCMPC_MINI
-       if (mpd_song_get_duration(song) > 0) {
+       if (options.second_column && mpd_song_get_duration(song) > 0) {
                char duration[32];
                format_duration_short(duration, sizeof(duration),
                                      mpd_song_get_duration(song));