![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Max Kellermann <max@duempel.org> | |
| Fri, 1 Jan 2010 14:01:52 +0000 (15:01 +0100) | ||
| committer | Max Kellermann <max@duempel.org> | |
| Fri, 1 Jan 2010 14:01:52 +0000 (15:01 +0100) |
| 1 | 2 | |||
|---|---|---|---|---|
| src/hscroll.h | patch | | diff1 | | diff2 | | blob | history |
| src/list_window.c | patch | | diff1 | | diff2 | | blob | history |
| src/screen_browser.c | patch | | diff1 | | diff2 | | blob | history |
| src/screen_interface.h | patch | | diff1 | | diff2 | | blob | history |
| src/screen_queue.c | patch | | diff1 | | diff2 | | blob | history |
| src/screen_song.c | patch | | diff1 | | diff2 | | blob | history |
| src/song_paint.h | patch | | diff1 | | diff2 | | blob | history |
| src/window.h | patch | | diff1 | | diff2 | | blob | history |
diff --combined src/hscroll.h
index 6d32b84b0b14aa16516628b9e1c7b664456a2fdb,37c6721a164ad0962184712cf96e1e65c43c9054..3e8fd79322b4c3e623ea82074a7c1411ae925a2c
--- 1/src/hscroll.h
--- 2/src/hscroll.h
+++ b/src/hscroll.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#ifndef HSCROLL_H
#define HSCROLL_H
+#include "config.h"
+
#include <glib.h>
#ifdef HAVE_NCURSESW_NCURSES_H
diff --combined src/list_window.c
index 4fe984dea796425c121e23ce3dc4e3df94aac3fd,a98176fbc937610ff20c000b79133e3bc5527346..d44fd29329b427965abedef04a113f3445187015
--- 1/src/list_window.c
--- 2/src/list_window.c
+++ b/src/list_window.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
void
list_window_set_length(struct list_window *lw, unsigned length)
{
+ if (length == lw->length)
+ return;
+
lw->length = length;
list_window_check_selected(lw);
diff --combined src/screen_browser.c
index 6bc224210ea783110bc16cb8ee62abad02ac9828,49827647d6e8f0898032fbad629c3b69b6e3a6e9..66727611d0901a41ef0ba71d0b765ab56863ab62
+++ b/src/screen_browser.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
+#include "config.h"
#include "screen_browser.h"
#include "screen_file.h"
#include "screen_song.h"
diff --combined src/screen_interface.h
index 7a8fdc604cf0a0439ff3debce15fbadd463320b6,8371b537004d9459efeaebd24987ee6f5e798482..a91c4d6cbc0890a9ff44857abe7041873afccb84
+++ b/src/screen_interface.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
#ifndef NCMPC_SCREEN_INTERFACE_H
#define NCMPC_SCREEN_INTERFACE_H
+#include "config.h"
#include "command.h"
#include <stdbool.h>
diff --combined src/screen_queue.c
index 1ca3d62adabca9ca0feed0b6ee7a797147ee660d,1ee8c001dab4b43db898d40ffc43bb82bc2cfd2b..c8fad68d2c7e52e2cf126a7aae6312ac094d7b51
--- 1/src/screen_queue.c
--- 2/src/screen_queue.c
+++ b/src/screen_queue.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
{
if (c->events & MPD_IDLE_QUEUE)
screen_queue_restore_selection();
+ else
+ /* the queue size may have changed, even if we havn't
+ revceived the QUEUE idle event yet */
+ list_window_set_length(lw, playlist_length(playlist));
if (((c->events & MPD_IDLE_PLAYER) != 0 &&
screen_queue_song_change(c->status)) ||
diff --combined src/screen_song.c
index 4ec8aa4952eae103633dab60bfa51c408ff73954,27b8b8bc1eefd0003fadacbeebf0d44bda9bb8e6..2c451c1599c38d2043fafa9ee97d3289c8daf24c
--- 1/src/screen_song.c
--- 2/src/screen_song.c
+++ b/src/screen_song.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
* This program is free software; you can redistribute it and/or modify
#include <assert.h>
#include <string.h>
+enum {
+ LABEL_LENGTH = MPD_TAG_COUNT,
+ LABEL_BITRATE,
+};
+
+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"),
+ [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_BITRATE] = N_("Bitrate"),
+};
+
+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;
static void
screen_song_init(WINDOW *w, int cols, int 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);
}
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)
{
- 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);
+ 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[LABEL_LENGTH]), length,
+ max_tag_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);
+
+ 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(_("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) {
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);
+ screen_song_append(_(tag_labels[LABEL_BITRATE]), buf,
+ 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);
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")) );
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();
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);
diff --combined src/song_paint.h
index 86cdfd9780842c5a33a12ce331ff4563bec24478,e46f4f5413d51bf527a5a31a4a4b5011f17588b1..10efde4ae9ef03e9df91567ab2869d13eb0c8e75
--- 1/src/song_paint.h
--- 2/src/song_paint.h
+++ b/src/song_paint.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
#ifndef NCMPC_SONG_PAINT_H
#define NCMPC_SONG_PAINT_H
+#include "config.h"
+
#include <stdbool.h>
#ifdef HAVE_NCURSESW_NCURSES_H
diff --combined src/window.h
index e66c808890abea7c102fb28c6f619796620ec720,4ebe6d7b52fd0eb1a5bf07be214bf5769308490b..5a33012df3b4e673a75b6728171983026d128e9c
--- 1/src/window.h
--- 2/src/window.h
+++ b/src/window.h
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 The Music Player Daemon Project
+ * (c) 2004-2010 The Music Player Daemon Project
* Project homepage: http://musicpd.org
*
* This program is free software; you can redistribute it and/or modify
#ifndef NCMPC_WINDOW_H
#define NCMPC_WINDOW_H
+#include "config.h"
+
#ifdef HAVE_NCURSESW_NCURSES_H
#include <ncursesw/ncurses.h>
#else