diff --git a/src/utils.c b/src/utils.c
index 49f3c63fa21e24557807304d712e133569b590b6..b748580a05cb0b81f396c8dc413215699f02bcf3 100644 (file)
--- a/src/utils.c
+++ b/src/utils.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 "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 mpd_entity *entity =
- filelist_get(filelist, i)->entity;
- char *name;
+ mpd_send_list_meta(connection, path);
- if (entity == NULL)
- continue;
+ 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_playlist *playlist =
mpd_entity_get_playlist(entity);
name = utf8_to_locale(mpd_playlist_get_path(playlist));
- } else
+ } else {
+ mpd_entity_free(entity);
continue;
+ }
list = g_list_append(list, name);
+ mpd_entity_free(entity);
}
- filelist_free(filelist);
return list;
}