![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/utils.c b/src/utils.c
index 8023bfb00879c67ae55abac46787fb9fc9ea58aa..d46f521f53b9ff9e816e9b1898d7145d85ef6b58 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
/* ncmpc (Ncurses MPD Client)
- * (c) 2004-2009 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 "utils.h"
#include "options.h"
#include "charset.h"
#include "i18n.h"
#include "mpdclient.h"
-#include "filelist.h"
#include <ctype.h>
#include <stdlib.h>
gcmp_list_from_path(struct mpdclient *c, const gchar *path,
GList *list, gint types)
{
- guint i;
- struct filelist *filelist;
-
- if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
+ struct mpd_connection *connection = mpdclient_get_connection(c);
+ if (connection == NULL)
return list;
- for (i = 0; i < filelist_length(filelist); ++i) {
- const struct filelist_entry *entry = filelist_get(filelist, i);
- const struct mpd_entity *entity = entry ? entry->entity : NULL;
- char *name = NULL;
+ mpd_send_list_meta(connection, path);
+
+ struct mpd_entity *entity;
+ while ((entity = mpd_recv_entity(connection)) != NULL) {
+ char *name;
- if (entity != NULL &&
- mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
+ if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
types & GCMP_TYPE_DIR) {
const struct mpd_directory *dir =
mpd_entity_get_directory(entity);
g_strlcpy(name, tmp, size);
g_strlcat(name, "/", size);
g_free(tmp);
- } else if (entity != NULL &&
- mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_SONG &&
types & GCMP_TYPE_FILE) {
const struct mpd_song *song =
mpd_entity_get_song(entity);
name = utf8_to_locale(mpd_song_get_uri(song));
- } else if (entity != NULL &&
- mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
+ } else if (mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_PLAYLIST &&
types & GCMP_TYPE_PLAYLIST) {
const struct mpd_playlist *playlist =
mpd_entity_get_playlist(entity);
name = utf8_to_locale(mpd_playlist_get_path(playlist));
+ } else {
+ mpd_entity_free(entity);
+ continue;
}
- if (name)
- list = g_list_append(list, name);
+ list = g_list_append(list, name);
+ mpd_entity_free(entity);
}
- filelist_free(filelist);
return list;
}
+void
+format_duration_short(char *buffer, size_t length, unsigned duration)
+{
+ if (duration < 3600)
+ g_snprintf(buffer, length,
+ "%i:%02i", duration / 60, duration % 60);
+ else
+ g_snprintf(buffer, length,
+ "%i:%02i:%02i", duration / 3600,
+ (duration % 3600) / 60, duration % 60);
+}
+
void
format_duration_long(char *p, size_t length, unsigned long duration)
{
- const char *year = _("year");
- const char *years = _("years");
- const char *week = _("week");
- const char *weeks = _("weeks");
- const char *day = _("day");
- const char *days = _("days");
unsigned bytes_written = 0;
if (duration / 31536000 > 0) {
if (duration / 31536000 == 1)
- bytes_written = g_snprintf(p, length, "%d %s, ", 1, year);
+ bytes_written = g_snprintf(p, length, "%d %s, ", 1, _("year"));
else
- bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, years);
+ bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 31536000, _("years"));
duration %= 31536000;
length -= bytes_written;
p += bytes_written;
}
if (duration / 604800 > 0) {
if (duration / 604800 == 1)
- bytes_written = g_snprintf(p, length, "%d %s, ", 1, week);
+ bytes_written = g_snprintf(p, length, "%d %s, ",
+ 1, _("week"));
else
- bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 604800, weeks);
+ bytes_written = g_snprintf(p, length, "%lu %s, ",
+ duration / 604800, _("weeks"));
duration %= 604800;
length -= bytes_written;
p += bytes_written;
}
if (duration / 86400 > 0) {
if (duration / 86400 == 1)
- bytes_written = g_snprintf(p, length, "%d %s, ", 1, day);
+ bytes_written = g_snprintf(p, length, "%d %s, ",
+ 1, _("day"));
else
- bytes_written = g_snprintf(p, length, "%lu %s, ", duration / 86400, days);
+ bytes_written = g_snprintf(p, length, "%lu %s, ",
+ duration / 86400, _("days"));
duration %= 86400;
length -= bytes_written;
p += bytes_written;