From 8331de424a67b137cd83ce817da0fceec647dc2f Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Wed, 2 Jan 2013 22:04:03 +0100 Subject: PlaylistInfo: rename class, use std::string --- src/PlaylistDatabase.cxx | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/PlaylistDatabase.cxx') diff --git a/src/PlaylistDatabase.cxx b/src/PlaylistDatabase.cxx index a2062a51..bbfdf748 100644 --- a/src/PlaylistDatabase.cxx +++ b/src/PlaylistDatabase.cxx @@ -38,20 +38,19 @@ playlist_database_quark(void) void playlist_vector_save(FILE *fp, const struct list_head *pv) { - struct playlist_metadata *pm; + PlaylistInfo *pm; playlist_vector_for_each(pm, pv) fprintf(fp, PLAYLIST_META_BEGIN "%s\n" "mtime: %li\n" "playlist_end\n", - pm->name, (long)pm->mtime); + pm->name.c_str(), (long)pm->mtime); } bool playlist_metadata_load(FILE *fp, struct list_head *pv, const char *name, GString *buffer, GError **error_r) { - struct playlist_metadata pm; - pm.mtime = 0; + PlaylistInfo pm(name, 0); char *line, *colon; const char *value; @@ -77,6 +76,6 @@ playlist_metadata_load(FILE *fp, struct list_head *pv, const char *name, } } - playlist_vector_update_or_add(pv, name, pm.mtime); + playlist_vector_update_or_add(pv, std::move(pm)); return true; } -- cgit v1.2.3