From 99fc43dec0fc2132d6b3a1a2a4c4cbd771802473 Mon Sep 17 00:00:00 2001
From: Lars-Dominik Braun <lars@6xq.net>
Date: Mon, 25 Sep 2017 19:26:37 +0200
Subject: Add (optional) song duration to song list format string

Closes #636.
---
 contrib/pianobar.1 |  3 +++
 src/ui.c           | 15 +++++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/contrib/pianobar.1 b/contrib/pianobar.1
index bf385f6..1fd53ae 100644
--- a/contrib/pianobar.1
+++ b/contrib/pianobar.1
@@ -255,6 +255,9 @@ Song title
 .B %r
 Rating icon
 
+.B %d
+Song duration
+
 .TP
 .B format_msg_none = %s
 .TQ
diff --git a/src/ui.c b/src/ui.c
index 88ad4d7..5f683ca 100644
--- a/src/ui.c
+++ b/src/ui.c
@@ -647,20 +647,27 @@ void BarUiPrintSong (const BarSettings_t *settings,
 size_t BarUiListSongs (const BarSettings_t *settings,
 		const PianoSong_t *song, const char *filter) {
 	size_t i = 0;
-	char digits[8];
 
 	PianoListForeachP (song) {
 		if (filter == NULL ||
 				(filter != NULL && (BarStrCaseStr (song->artist, filter) != NULL ||
 				BarStrCaseStr (song->title, filter) != NULL))) {
-			char outstr[512];
+			char outstr[512], digits[8], duration[8] = "??:??";
 			const char *vals[] = {digits, song->artist, song->title,
 					(song->rating == PIANO_RATE_LOVE) ? settings->loveIcon :
-					((song->rating == PIANO_RATE_BAN) ? settings->banIcon : "")};
+					((song->rating == PIANO_RATE_BAN) ? settings->banIcon : ""),
+					duration};
 
+			/* pre-format a few strings */
 			snprintf (digits, sizeof (digits) / sizeof (*digits), "%2zu", i);
+			const unsigned int length = song->length;
+			if (length > 0) {
+				snprintf (duration, sizeof (duration), "%02u:%02u",
+						length / 60, length % 60);
+			}
+
 			BarUiCustomFormat (outstr, sizeof (outstr), settings->listSongFormat,
-					"iatr", vals);
+					"iatrd", vals);
 			BarUiAppendNewline (outstr, sizeof (outstr));
 			BarUiMsg (settings, MSG_LIST, "%s", outstr);
 		}
-- 
cgit v1.2.3