xterm_title: simplify if/else chains

[ncmpc.git] / src / song_paint.c

diff --git a/src/song_paint.c b/src/song_paint.c
index b0c452b8472d5b58c5c66f3206b1d9fb4aa18410..3b55eaf7c2d88136d3e012fe09d87e46dc1d27f2 100644 (file)
--- a/src/song_paint.c
+++ b/src/song_paint.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
@@ -32,13 +32,13 @@
 #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);