From ac3ad452c03292e4c57b0d0e21c2dd407eb03a27 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Sun, 12 Feb 2012 17:50:30 +0100 Subject: playlist_vector: use the list_head library --- src/directory.h | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'src/directory.h') diff --git a/src/directory.h b/src/directory.h index 769260436..dc664a433 100644 --- a/src/directory.h +++ b/src/directory.h @@ -22,7 +22,6 @@ #include "check.h" #include "util/list.h" -#include "playlist_vector.h" #include #include @@ -45,6 +44,12 @@ #define directory_for_each_song_safe(pos, n, directory) \ list_for_each_entry_safe(pos, n, &directory->songs, siblings) +#define directory_for_each_playlist(pos, directory) \ + list_for_each_entry(pos, &directory->playlists, siblings) + +#define directory_for_each_playlist_safe(pos, n, directory) \ + list_for_each_entry_safe(pos, n, &directory->playlists, siblings) + struct song; struct db_visitor; @@ -75,7 +80,7 @@ struct directory { */ struct list_head songs; - struct playlist_vector playlists; + struct list_head playlists; struct directory *parent; time_t mtime; @@ -129,7 +134,7 @@ directory_is_empty(const struct directory *directory) { return list_empty(&directory->children) && list_empty(&directory->songs) && - playlist_vector_is_empty(&directory->playlists); + list_empty(&directory->playlists); } static inline const char * -- cgit v1.2.3