summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars-Dominik Braun <lars@6xq.net>2017-09-25 19:26:37 +0200
committerMichał Cichoń <michcic@gmail.com>2018-10-30 12:01:26 +0100
commit99fc43dec0fc2132d6b3a1a2a4c4cbd771802473 (patch)
tree3620ccf36134e7b1abb1bd8131829d1417ed528f
parentd85cf786935f3b3517b4156074d2bbbbf1e43494 (diff)
downloadpianobar-windows-99fc43dec0fc2132d6b3a1a2a4c4cbd771802473.tar.gz
pianobar-windows-99fc43dec0fc2132d6b3a1a2a4c4cbd771802473.tar.bz2
pianobar-windows-99fc43dec0fc2132d6b3a1a2a4c4cbd771802473.zip
Add (optional) song duration to song list format string
Closes #636.
-rw-r--r--contrib/pianobar.13
-rw-r--r--src/ui.c15
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);
}