X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fscreen_song.c;h=086768cec6b058f353604cf1b3df2bfd35156846;hb=e73ca303e9c688dde39ec70b20b7e1f811fe99e8;hp=27b8b8bc1eefd0003fadacbeebf0d44bda9bb8e6;hpb=0796b270b1699336f29908d11bca92d64da0653c;p=ncmpc.git

diff --git a/src/screen_song.c b/src/screen_song.c
index 27b8b8b..086768c 100644
--- a/src/screen_song.c
+++ b/src/screen_song.c
@@ -1,21 +1,21 @@
 /* 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
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * 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 "screen_song.h"
 #include "screen_interface.h"
@@ -34,6 +34,56 @@
 #include <assert.h>
 #include <string.h>
 
+enum {
+	LABEL_LENGTH = MPD_TAG_COUNT,
+	LABEL_PATH,
+	LABEL_BITRATE,
+	LABEL_FORMAT,
+	LABEL_POSITION,
+};
+
+static const char *const tag_labels[] = {
+	[MPD_TAG_ARTIST] = N_("Artist"),
+	[MPD_TAG_TITLE] = N_("Title"),
+	[MPD_TAG_ALBUM] = N_("Album"),
+	[LABEL_LENGTH] = N_("Length"),
+	[LABEL_POSITION] = N_("Position"),
+	[MPD_TAG_COMPOSER] = N_("Composer"),
+	[MPD_TAG_NAME] = N_("Name"),
+	[MPD_TAG_DISC] = N_("Disc"),
+	[MPD_TAG_TRACK] = N_("Track"),
+	[MPD_TAG_DATE] = N_("Date"),
+	[MPD_TAG_GENRE] = N_("Genre"),
+	[MPD_TAG_COMMENT] = N_("Comment"),
+	[LABEL_PATH] = N_("Path"),
+	[LABEL_BITRATE] = N_("Bitrate"),
+	[LABEL_FORMAT] = N_("Format"),
+};
+
+static unsigned max_tag_label_width;
+
+enum stats_label {
+	STATS_ARTISTS,
+	STATS_ALBUMS,
+	STATS_SONGS,
+	STATS_UPTIME,
+	STATS_DBUPTIME,
+	STATS_PLAYTIME,
+	STATS_DBPLAYTIME,
+};
+
+static const char *const stats_labels[] = {
+	[STATS_ARTISTS] = N_("Number of artists"),
+	[STATS_ALBUMS] = N_("Number of albums"),
+	[STATS_SONGS] = N_("Number of songs"),
+	[STATS_UPTIME] = N_("Uptime"),
+	[STATS_DBUPTIME] = N_("Most recent db update"),
+	[STATS_PLAYTIME] = N_("Playtime"),
+	[STATS_DBPLAYTIME] = N_("DB playtime"),
+};
+
+static unsigned max_stats_label_width;
+
 static struct list_window *lw;
 
 static struct mpd_song *next_song;
@@ -62,21 +112,8 @@ screen_song_clear(void)
 	}
 }
 
-static void
-screen_song_paint(void);
-
-/**
- * Repaint and update the screen.
- */
-static void
-screen_song_repaint(void)
-{
-	screen_song_paint();
-	wrefresh(lw->w);
-}
-
 static const char *
-screen_song_list_callback(unsigned idx, G_GNUC_UNUSED void *data)
+screen_song_list_callback(unsigned idx, gcc_unused void *data)
 {
 	assert(idx < current.lines->len);
 
@@ -85,8 +122,26 @@ screen_song_list_callback(unsigned idx, G_GNUC_UNUSED void *data)
 
 
 static void
-screen_song_init(WINDOW *w, int cols, int rows)
+screen_song_init(WINDOW *w, unsigned cols, unsigned rows)
 {
+	for (unsigned i = 0; i < G_N_ELEMENTS(tag_labels); ++i) {
+		if (tag_labels[i] != NULL) {
+			unsigned width = utf8_width(_(tag_labels[i]));
+
+			if (width > max_tag_label_width)
+				max_tag_label_width = width;
+		}
+	}
+
+	for (unsigned i = 0; i < G_N_ELEMENTS(stats_labels); ++i) {
+		if (stats_labels[i] != NULL) {
+			unsigned width = utf8_width(_(stats_labels[i]));
+
+			if (width > max_stats_label_width)
+				max_stats_label_width = width;
+		}
+	}
+
 	/* We will need at least 10 lines, so this saves 10 reallocations :) */
 	current.lines = g_ptr_array_sized_new(10);
 	lw = list_window_init(w, cols, rows);
@@ -105,13 +160,13 @@ screen_song_exit(void)
 }
 
 static void
-screen_song_resize(int cols, int rows)
+screen_song_resize(unsigned cols, unsigned rows)
 {
 	list_window_resize(lw, cols, rows);
 }
 
 static const char *
-screen_song_title(G_GNUC_UNUSED char *str, G_GNUC_UNUSED size_t size)
+screen_song_title(gcc_unused char *str, gcc_unused size_t size)
 {
 	return _("Song viewer");
 }
@@ -127,12 +182,7 @@ screen_song_paint(void)
 static void
 screen_song_append(const char *label, const char *value, unsigned label_col)
 {
-	unsigned label_width = locale_width(label) + 2;
-	int value_col, label_size;
-	gchar *entry, *entry_iter;
-	const gchar *value_iter;
-	char *p, *q;
-	unsigned width;
+	const unsigned label_width = locale_width(label) + 2;
 
 	assert(label != NULL);
 	assert(value != NULL);
@@ -140,13 +190,13 @@ screen_song_append(const char *label, const char *value, unsigned label_col)
 
 	/* +2 for ': ' */
 	label_col += 2;
-	value_col = lw->cols - label_col;
+	const int value_col = lw->cols - label_col;
 	/* calculate the number of required linebreaks */
-	value_iter = value;
-	label_size = strlen(label) + label_col;
+	const gchar *value_iter = value;
+	const int label_size = strlen(label) + label_col;
 
 	while (*value_iter != 0) {
-		entry = g_malloc(label_size);
+		char *entry = g_malloc(label_size), *entry_iter;
 		if (value_iter == value) {
 			entry_iter = entry + g_sprintf(entry, "%s: ", label);
 			/* fill the label column with whitespaces */
@@ -161,8 +211,8 @@ screen_song_append(const char *label, const char *value, unsigned label_col)
 		/* skip whitespaces */
 		while (g_ascii_isspace(*value_iter)) ++value_iter;
 
-		p = g_strdup(value_iter);
-		width = utf8_cut_width(p, value_col);
+		char *p = g_strdup(value_iter);
+		unsigned width = utf8_cut_width(p, value_col);
 		if (width == 0)
 			/* not enough room for anything - bail out */
 			break;
@@ -171,7 +221,7 @@ screen_song_append(const char *label, const char *value, unsigned label_col)
 
 		value_iter += strlen(p);
 		p = replace_utf8_to_locale(p);
-		q = g_strconcat(entry, p, NULL);
+		char *q = g_strconcat(entry, p, NULL);
 		g_free(entry);
 		g_free(p);
 
@@ -180,141 +230,122 @@ screen_song_append(const char *label, const char *value, unsigned label_col)
 }
 
 static void
-screen_song_append_tag(const char *label, const struct mpd_song *song,
-		       enum mpd_tag_type tag, unsigned label_col)
+screen_song_append_tag(const struct mpd_song *song, enum mpd_tag_type tag)
 {
+	const char *label = _(tag_labels[tag]);
 	unsigned i = 0;
 	const char *value;
 
+	assert((unsigned)tag < G_N_ELEMENTS(tag_labels));
+	assert(label != NULL);
+
 	while ((value = mpd_song_get_tag(song, tag, i++)) != NULL)
-		screen_song_append(label, value, label_col);
+		screen_song_append(label, value, 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)
 {
-	unsigned i, max_label_width;
-	enum label {
-		ARTIST, TITLE, ALBUM, LENGTH, COMPOSER, NAME, DISC, TRACK,
-		DATE, GENRE, COMMENT, BITRATE
-	};
-	const char *labels[] = { [ARTIST] = _("Artist"),
-		[TITLE] = _("Title"),
-		[ALBUM] = _("Album"),
-		[LENGTH] = _("Length"),
-		[COMPOSER] = _("Composer"),
-		[NAME] = _("Name"),
-		[DISC] = _("Disc"),
-		[TRACK] = _("Track"),
-		[DATE] = _("Date"),
-		[GENRE] = _("Genre"),
-		[COMMENT] = _("Comment"),
-		[BITRATE] = _("Bitrate"),
-	};
-	/* Determine the width of the longest label */
-	max_label_width = utf8_width(labels[0]);
-	for (i = 1; i < G_N_ELEMENTS(labels); ++i) {
-		if (utf8_width(labels[i]) > max_label_width)
-			max_label_width = utf8_width(labels[i]);
-	}
-
 	assert(song != NULL);
 
-	screen_song_append_tag(labels[ARTIST], song, MPD_TAG_ARTIST,
-			       max_label_width);
-	screen_song_append_tag(labels[TITLE], song, MPD_TAG_TITLE,
-			       max_label_width);
-	screen_song_append_tag(labels[ALBUM], song, MPD_TAG_ALBUM,
-			       max_label_width);
+	char songpos[16];
+	g_snprintf(songpos, sizeof(songpos), "%d", mpd_song_get_pos(song) + 1);
+	screen_song_append(_(tag_labels[LABEL_POSITION]), songpos,
+			   max_tag_label_width);
+
+	screen_song_append_tag(song, MPD_TAG_ARTIST);
+	screen_song_append_tag(song, MPD_TAG_TITLE);
+	screen_song_append_tag(song, MPD_TAG_ALBUM);
+
 	/* create time string and add it */
 	if (mpd_song_get_duration(song) > 0) {
 		char length[16];
 		format_duration_short(length, sizeof(length),
 				      mpd_song_get_duration(song));
-		screen_song_append(labels[LENGTH], length, max_label_width);
-	}
-	screen_song_append_tag(labels[COMPOSER], song, MPD_TAG_COMPOSER,
-			       max_label_width);
-	screen_song_append_tag(labels[NAME], song, MPD_TAG_NAME,
-			       max_label_width);
-	screen_song_append_tag(labels[DISC], song, MPD_TAG_DISC,
-			       max_label_width);
-	screen_song_append_tag(labels[TRACK], song, MPD_TAG_TRACK,
-			       max_label_width);
-	screen_song_append_tag(labels[DATE], song, MPD_TAG_DATE,
-			       max_label_width);
-	screen_song_append_tag(labels[GENRE], song, MPD_TAG_GENRE,
-			       max_label_width);
-	screen_song_append_tag(labels[COMMENT], song, MPD_TAG_COMMENT,
-			       max_label_width);
-	screen_song_append(_("Path"), mpd_song_get_uri(song), max_label_width);
-	if (mpdclient_is_playing(c) && c->song != NULL &&
-	    strcmp(mpd_song_get_uri(c->song), mpd_song_get_uri(song)) == 0) {
-		char buf[16];
-		g_snprintf(buf, sizeof(buf), _("%d kbps"),
-			   mpd_status_get_kbit_rate(c->status));
-		screen_song_append(labels[BITRATE], buf, max_label_width);
+
+		const char *value = length;
+
+		char buffer[64];
+
+		if (mpd_song_get_end(song) > 0) {
+			char start[16], end[16];
+			format_duration_short(start, sizeof(start),
+					      mpd_song_get_start(song));
+			format_duration_short(end, sizeof(end),
+					      mpd_song_get_end(song));
+
+			snprintf(buffer, sizeof(buffer), "%s [%s-%s]\n",
+				 length, start, end);
+			value = buffer;
+		} else if (mpd_song_get_start(song) > 0) {
+			char start[16];
+			format_duration_short(start, sizeof(start),
+					      mpd_song_get_start(song));
+
+			snprintf(buffer, sizeof(buffer), "%s [%s-]\n",
+				 length, start);
+			value = buffer;
+		}
+
+		screen_song_append(_(tag_labels[LABEL_LENGTH]), value,
+				   max_tag_label_width);
 	}
+
+	screen_song_append_tag(song, MPD_TAG_COMPOSER);
+	screen_song_append_tag(song, MPD_TAG_NAME);
+	screen_song_append_tag(song, MPD_TAG_DISC);
+	screen_song_append_tag(song, MPD_TAG_TRACK);
+	screen_song_append_tag(song, MPD_TAG_DATE);
+	screen_song_append_tag(song, MPD_TAG_GENRE);
+	screen_song_append_tag(song, MPD_TAG_COMMENT);
+
+	screen_song_append(_(tag_labels[LABEL_PATH]), mpd_song_get_uri(song),
+			   max_tag_label_width);
+}
+
+static void
+screen_song_append_stats(enum stats_label label, const char *value)
+{
+	screen_song_append(_(stats_labels[label]), value,
+			   max_stats_label_width);
 }
 
 static bool
 screen_song_add_stats(struct mpd_connection *connection)
 {
-	unsigned i, max_label_width;
-	char buf[64];
-	GDate *date;
-	enum label {
-		ARTISTS, ALBUMS, SONGS, UPTIME,
-		DBUPTIME, PLAYTIME, DBPLAYTIME
-	};
-	const char *labels[] = { [ARTISTS] = _("Number of artists"),
-		[ALBUMS] = _("Number of albums"),
-		[SONGS] = _("Number of songs"),
-		[UPTIME] = _("Uptime"),
-		[DBUPTIME] =_("Most recent db update"),
-		[PLAYTIME] = _("Playtime"),
-		[DBPLAYTIME] = _("DB playtime")
-	};
-	struct mpd_stats *mpd_stats;
-
-	mpd_stats = mpd_run_stats(connection);
+	struct mpd_stats *mpd_stats = mpd_run_stats(connection);
 	if (mpd_stats == NULL)
 		return false;
 
-	/* Determine the width of the longest label */
-	max_label_width = utf8_width(labels[0]);
-	for (i = 1; i < G_N_ELEMENTS(labels); ++i) {
-		if (utf8_width(labels[i]) > max_label_width)
-			max_label_width = utf8_width(labels[i]);
-	}
-
 	g_ptr_array_add(current.lines, g_strdup(_("MPD statistics")) );
+
+	char buf[64];
 	g_snprintf(buf, sizeof(buf), "%d",
 		   mpd_stats_get_number_of_artists(mpd_stats));
-	screen_song_append(labels[ARTISTS], buf, max_label_width);
+	screen_song_append_stats(STATS_ARTISTS, buf);
 	g_snprintf(buf, sizeof(buf), "%d",
 		   mpd_stats_get_number_of_albums(mpd_stats));
-	screen_song_append(labels[ALBUMS], buf, max_label_width);
+	screen_song_append_stats(STATS_ALBUMS, buf);
 	g_snprintf(buf, sizeof(buf), "%d",
 		   mpd_stats_get_number_of_songs(mpd_stats));
-	screen_song_append(labels[SONGS], buf, max_label_width);
+	screen_song_append_stats(STATS_SONGS, buf);
 
 	format_duration_long(buf, sizeof(buf),
 			     mpd_stats_get_db_play_time(mpd_stats));
-	screen_song_append(labels[DBPLAYTIME], buf, max_label_width);
+	screen_song_append_stats(STATS_DBPLAYTIME, buf);
 
 	format_duration_long(buf, sizeof(buf),
 			     mpd_stats_get_play_time(mpd_stats));
-	screen_song_append(labels[PLAYTIME], buf, max_label_width);
+	screen_song_append_stats(STATS_PLAYTIME, buf);
 
 	format_duration_long(buf, sizeof(buf),
 			     mpd_stats_get_uptime(mpd_stats));
-	screen_song_append(labels[UPTIME], buf, max_label_width);
+	screen_song_append_stats(STATS_UPTIME, buf);
 
-	date = g_date_new();
+	GDate *date = g_date_new();
 	g_date_set_time_t(date, mpd_stats_get_db_update_time(mpd_stats));
 	g_date_strftime(buf, sizeof(buf), "%x", date);
-	screen_song_append(labels[DBUPTIME], buf, max_label_width);
+	screen_song_append_stats(STATS_DBUPTIME, buf);
 	g_date_free(date);
 
 	mpd_stats_free(mpd_stats);
@@ -322,10 +353,43 @@ screen_song_add_stats(struct mpd_connection *connection)
 }
 
 static void
-screen_song_update(struct mpdclient *c)
+audio_format_to_string(char *buffer, size_t size,
+		       const struct mpd_audio_format *format)
 {
-	struct mpd_connection *connection;
+#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)
+{
 	/* Clear all lines */
 	for (guint i = 0; i < current.lines->len; ++i)
 		g_free(g_ptr_array_index(current.lines, i));
@@ -344,7 +408,7 @@ 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"));
 	}
 
@@ -354,24 +418,42 @@ screen_song_update(struct mpdclient *c)
 		}
 		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"));
 	}
 
 	/* Add some statistics about mpd */
-	connection = mpdclient_get_connection(c);
+	struct mpd_connection *connection = mpdclient_get_connection(c);
 	if (connection != NULL && !screen_song_add_stats(connection))
 		mpdclient_handle_error(c);
 
 	list_window_set_length(lw, current.lines->len);
-	screen_song_repaint();
+	screen_song_paint();
 }
 
 static bool
 screen_song_cmd(struct mpdclient *c, command_t cmd)
 {
 	if (list_window_scroll_cmd(lw, cmd)) {
-		screen_song_repaint();
+		screen_song_paint();
 		return true;
 	}
 
@@ -417,7 +499,7 @@ screen_song_cmd(struct mpdclient *c, command_t cmd)
 	if (screen_find(lw, cmd, screen_song_list_callback, NULL)) {
 		/* center the row */
 		list_window_center(lw, lw->selected);
-		screen_song_repaint();
+		screen_song_paint();
 		return true;
 	}