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/UpdateWalk.cxx | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'src/UpdateWalk.cxx') diff --git a/src/UpdateWalk.cxx b/src/UpdateWalk.cxx index 860342001..a34e0028d 100644 --- a/src/UpdateWalk.cxx +++ b/src/UpdateWalk.cxx @@ -159,11 +159,12 @@ purge_deleted_from_directory(struct directory *directory) g_free(path); } - struct playlist_metadata *pm, *np; + PlaylistInfo *pm, *np; directory_for_each_playlist_safe(pm, np, directory) { - if (!directory_child_is_regular(directory, pm->name)) { + if (!directory_child_is_regular(directory, pm->name.c_str())) { db_lock(); - playlist_vector_remove(&directory->playlists, pm->name); + playlist_vector_remove(&directory->playlists, + pm->name.c_str()); db_unlock(); } } @@ -214,9 +215,11 @@ update_playlist_file2(struct directory *directory, if (!playlist_suffix_supported(suffix)) return false; + PlaylistInfo pi(name, st->st_mtime); + db_lock(); - if (playlist_vector_update_or_add(&directory->playlists, name, - st->st_mtime)) + if (playlist_vector_update_or_add(&directory->playlists, + std::move(pi))) modified = true; db_unlock(); return true; -- cgit v1.2.3