diff --git a/src/screen_song.c b/src/screen_song.c
index 6d3a0342a7c592eed21b0083e05915592db900e9..c6d7d801e47299c3413079bc60577898d704f25f 100644 (file)
--- a/src/screen_song.c
+++ b/src/screen_song.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
LABEL_LENGTH = MPD_TAG_COUNT,
LABEL_PATH,
LABEL_BITRATE,
+ LABEL_FORMAT,
LABEL_POSITION,
};
[MPD_TAG_COMMENT] = N_("Comment"),
[LABEL_PATH] = N_("Path"),
[LABEL_BITRATE] = N_("Bitrate"),
+ [LABEL_FORMAT] = N_("Format"),
};
static unsigned max_tag_label_width;
}
static void
-screen_song_add_song(const struct mpd_song *song, const struct mpdclient *c)
+screen_song_add_song(const struct mpd_song *song)
{
assert(song != NULL);
screen_song_append(_(tag_labels[LABEL_PATH]), mpd_song_get_uri(song),
max_tag_label_width);
- if (mpdclient_is_playing(c) && c->song != NULL &&
- strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0 &&
- mpd_status_get_kbit_rate(c->status)) {
- char buf[16];
- g_snprintf(buf, sizeof(buf), _("%d kbps"),
- mpd_status_get_kbit_rate(c->status));
- screen_song_append(_(tag_labels[LABEL_BITRATE]), buf,
- max_tag_label_width);
- }
}
static void
return true;
}
+static void
+audio_format_to_string(char *buffer, size_t size,
+ const struct mpd_audio_format *format)
+{
+#if LIBMPDCLIENT_CHECK_VERSION(2,10,0)
+ if (format->bits == MPD_SAMPLE_FORMAT_FLOAT) {
+ g_snprintf(buffer, size, _("%u:f:%u"),
+ format->sample_rate,
+ format->channels);
+ return;
+ }
+
+ if (format->bits == MPD_SAMPLE_FORMAT_DSD) {
+ if (format->sample_rate > 0 &&
+ format->sample_rate % 44100 == 0) {
+ /* use shortcuts such as "dsd64" which implies the
+ sample rate */
+ g_snprintf(buffer, size, _("dsd%u:%u"),
+ format->sample_rate * 8 / 44100,
+ format->channels);
+ return;
+ }
+
+ g_snprintf(buffer, size, _("%u:dsd:%u"),
+ format->sample_rate,
+ format->channels);
+ return;
+ }
+#endif
+
+ g_snprintf(buffer, size, _("%u:%u:%u"),
+ format->sample_rate, format->bits,
+ format->channels);
+}
+
static void
screen_song_update(struct mpdclient *c)
{
mpd_song_get_uri(c->song)) != 0 ||
!mpdclient_is_playing(c))) {
g_ptr_array_add(current.lines, g_strdup(_("Selected song")) );
- screen_song_add_song(current.selected_song, c);
+ screen_song_add_song(current.selected_song);
g_ptr_array_add(current.lines, g_strdup("\0"));
}
}
current.played_song = mpd_song_dup(c->song);
g_ptr_array_add(current.lines, g_strdup(_("Currently playing song")));
- screen_song_add_song(current.played_song, c);
+ screen_song_add_song(current.played_song);
+
+ if (mpd_status_get_kbit_rate(c->status) > 0) {
+ char buf[16];
+ g_snprintf(buf, sizeof(buf), _("%d kbps"),
+ mpd_status_get_kbit_rate(c->status));
+ screen_song_append(_(tag_labels[LABEL_BITRATE]), buf,
+ max_tag_label_width);
+ }
+
+ const struct mpd_audio_format *format =
+ mpd_status_get_audio_format(c->status);
+ if (format) {
+ char buf[32];
+ audio_format_to_string(buf, sizeof(buf), format);
+ screen_song_append(_(tag_labels[LABEL_FORMAT]), buf,
+ max_tag_label_width);
+ }
+
g_ptr_array_add(current.lines, g_strdup("\0"));
}