diff --git a/src/utils.c b/src/utils.c
index 688f6c88f4463afc93938fe3008dca8d16794d39..84db64a5b122211081fc0df2a02e206411befb51 100644 (file)
--- a/src/utils.c
+++ b/src/utils.c
#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;
+ struct mpd_connection *connection;
+ struct mpd_entity *entity;
- if ((filelist = mpdclient_filelist_get(c, path)) == NULL)
+ 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);
- if (entity != NULL &&
- mpd_entity_get_type(entity) == MPD_ENTITY_TYPE_DIRECTORY &&
+ while ((entity = mpd_recv_entity(connection)) != NULL) {
+ char *name;
+
+ 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;
}
-char *
-format_duration_long(unsigned long duration)
+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 *weeks = _("weeks");
const char *day = _("day");
const char *days = _("days");
- char *buffer, *p;
unsigned bytes_written = 0;
- unsigned length = utf8_width(years) +
- utf8_width(weeks) + utf8_width(days) + 32;
- buffer = g_malloc(length);
- p = buffer;
if (duration / 31536000 > 0) {
if (duration / 31536000 == 1)
bytes_written = g_snprintf(p, length, "%d %s, ", 1, year);
length -= bytes_written;
p += bytes_written;
}
+
g_snprintf(p, length, "%02lu:%02lu:%02lu", duration / 3600,
duration % 3600 / 60, duration % 3600 % 60);
- return buffer;
}
-
-