From 609f6ce66de4d100388531db5a420f155b7bf64d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Thu, 27 Sep 2012 23:48:29 +0200 Subject: PlaylistFile: use std::list instead of GPtrArray --- src/OtherCommands.cxx | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) (limited to 'src/OtherCommands.cxx') diff --git a/src/OtherCommands.cxx b/src/OtherCommands.cxx index ab732195..2c714507 100644 --- a/src/OtherCommands.cxx +++ b/src/OtherCommands.cxx @@ -57,17 +57,13 @@ extern "C" { #include static void -print_spl_list(struct client *client, GPtrArray *list) +print_spl_list(struct client *client, const PlaylistFileList &list) { - for (unsigned i = 0; i < list->len; ++i) { - struct stored_playlist_info *playlist = - (struct stored_playlist_info *) - g_ptr_array_index(list, i); + for (const auto &i : list) { + client_printf(client, "playlist: %s\n", i.name.c_str()); - client_printf(client, "playlist: %s\n", playlist->name); - - if (playlist->mtime > 0) - time_print(client, "Last-Modified", playlist->mtime); + if (i.mtime > 0) + time_print(client, "Last-Modified", i.mtime); } } @@ -147,11 +143,8 @@ handle_lsinfo(struct client *client, int argc, char *argv[]) return result; if (isRootDirectory(uri)) { - GPtrArray *list = spl_list(NULL); - if (list != NULL) { - print_spl_list(client, list); - spl_list_free(list); - } + const auto &list = ListPlaylistFiles(NULL); + print_spl_list(client, list); } return COMMAND_RETURN_OK; -- cgit v1.2.3