diff options
Diffstat (limited to '')
| -rw-r--r-- | src/PlaylistUpdate.cxx | 31 |
1 files changed, 12 insertions, 19 deletions
diff --git a/src/PlaylistUpdate.cxx b/src/PlaylistUpdate.cxx index 0e72ef671..89132ca7b 100644 --- a/src/PlaylistUpdate.cxx +++ b/src/PlaylistUpdate.cxx @@ -1,5 +1,5 @@ /* - * Copyright (C) 2003-2013 The Music Player Daemon Project + * Copyright (C) 2003-2014 The Music Player Daemon Project * http://www.musicpd.org * * This program is free software; you can redistribute it and/or modify @@ -19,55 +19,48 @@ #include "config.h" #include "Playlist.hxx" -#include "DatabaseGlue.hxx" -#include "DatabasePlugin.hxx" -#include "Song.hxx" +#include "db/DatabasePlugin.hxx" +#include "db/LightSong.hxx" +#include "DetachedSong.hxx" #include "tag/Tag.hxx" #include "Idle.hxx" #include "util/Error.hxx" static bool -UpdatePlaylistSong(const Database &db, Song &song) +UpdatePlaylistSong(const Database &db, DetachedSong &song) { - if (!song.IsInDatabase() || !song.IsDetached()) + if (!song.IsInDatabase() || !song.IsFile()) /* only update Songs instances that are "detached" from the Database */ return false; - Song *original = db.GetSong(song.uri, IgnoreError()); + const LightSong *original = db.GetSong(song.GetURI(), IgnoreError()); if (original == nullptr) /* not found - shouldn't happen, because the update thread should ensure that all stale Song instances have been purged */ return false; - if (original->mtime == song.mtime) { + if (original->mtime == song.GetLastModified()) { /* not modified */ db.ReturnSong(original); return false; } - song.mtime = original->mtime; - - if (original->tag != nullptr) - song.ReplaceTag(Tag(*original->tag)); + song.SetLastModified(original->mtime); + song.SetTag(*original->tag); db.ReturnSong(original); return true; } void -playlist::DatabaseModified() +playlist::DatabaseModified(const Database &db) { - const Database *db = GetDatabase(); - if (db == nullptr) - /* how can this ever happen? */ - return; - bool modified = false; for (unsigned i = 0, n = queue.GetLength(); i != n; ++i) { - if (UpdatePlaylistSong(*db, queue.Get(i))) { + if (UpdatePlaylistSong(db, queue.Get(i))) { queue.ModifyAtPosition(i); modified = true; } |