diff options
| author | Max Kellermann <max@duempel.org> | 2013-01-02 22:16:52 +0100 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2013-01-03 02:25:06 +0100 |
| commit | 9023ba4a81d597c8694432655833cf23d83c6cde (patch) | |
| tree | 304c2465ea160297dff17302f36c4cc38687ccb6 /src/Directory.hxx | |
| parent | 83488848e1091024a0a307b1539c1a85762ee1f1 (diff) | |
| download | mpd-9023ba4a81d597c8694432655833cf23d83c6cde.tar.gz mpd-9023ba4a81d597c8694432655833cf23d83c6cde.tar.xz mpd-9023ba4a81d597c8694432655833cf23d83c6cde.zip | |
PlaylistVector: use std::list
Diffstat (limited to 'src/Directory.hxx')
| -rw-r--r-- | src/Directory.hxx | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/Directory.hxx b/src/Directory.hxx index ab23a6922..710f47921 100644 --- a/src/Directory.hxx +++ b/src/Directory.hxx @@ -24,6 +24,7 @@ #include "util/list.h" #include "gcc.h" #include "DatabaseVisitor.hxx" +#include "PlaylistVector.hxx" #include <glib.h> #include <stdbool.h> @@ -44,12 +45,6 @@ #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; class SongFilter; @@ -81,7 +76,7 @@ struct Directory { */ struct list_head songs; - struct list_head playlists; + PlaylistVector playlists; Directory *parent; time_t mtime; @@ -179,7 +174,7 @@ public: bool IsEmpty() const { return list_empty(&children) && list_empty(&songs) && - list_empty(&playlists); + playlists.empty(); } gcc_pure |