aboutsummaryrefslogtreecommitdiffstats
path: root/src/PlaylistFile.cxx
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2013-01-04 00:02:09 +0100
committerMax Kellermann <max@duempel.org>2013-01-04 00:02:09 +0100
commit9d312ab208f797a69c8366f4a961d6cb3228cecb (patch)
treedb4f22c858684ab16f0a8010207b9fbf46119985 /src/PlaylistFile.cxx
parent06be0a199722e945701d720fe40068c6de6c8f40 (diff)
downloadmpd-9d312ab208f797a69c8366f4a961d6cb3228cecb.tar.gz
mpd-9d312ab208f797a69c8366f4a961d6cb3228cecb.tar.xz
mpd-9d312ab208f797a69c8366f4a961d6cb3228cecb.zip
PlaylistFile: reuse classes PlaylistInfo and PlaylistVector
.. instead of rolling own classes.
Diffstat (limited to 'src/PlaylistFile.cxx')
-rw-r--r--src/PlaylistFile.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/PlaylistFile.cxx b/src/PlaylistFile.cxx
index 03cd59d67..de12518d9 100644
--- a/src/PlaylistFile.cxx
+++ b/src/PlaylistFile.cxx
@@ -20,6 +20,8 @@
#include "config.h"
#include "PlaylistFile.hxx"
#include "PlaylistSave.hxx"
+#include "PlaylistInfo.hxx"
+#include "PlaylistVector.hxx"
#include "DatabasePlugin.hxx"
#include "DatabaseGlue.hxx"
#include "song.h"
@@ -140,7 +142,7 @@ playlist_errno(GError **error_r)
}
static bool
-LoadPlaylistFileInfo(PlaylistFileInfo &info,
+LoadPlaylistFileInfo(PlaylistInfo &info,
const char *parent_path_fs, const char *name_fs)
{
size_t name_length = strlen(name_fs);
@@ -172,10 +174,10 @@ LoadPlaylistFileInfo(PlaylistFileInfo &info,
return true;
}
-PlaylistFileList
+PlaylistVector
ListPlaylistFiles(GError **error_r)
{
- PlaylistFileList list;
+ PlaylistVector list;
const char *parent_path_fs = spl_map(error_r);
if (parent_path_fs == NULL)
@@ -187,7 +189,7 @@ ListPlaylistFiles(GError **error_r)
return list;
}
- PlaylistFileInfo info;
+ PlaylistInfo info;
struct dirent *ent;
while ((ent = readdir(dir)) != NULL) {
if (LoadPlaylistFileInfo(info, parent_path_fs, ent->d_name))