diff options
| -rw-r--r-- | src/Instance.cxx | 3 | ||||
| -rw-r--r-- | src/Partition.cxx | 4 | ||||
| -rw-r--r-- | src/Partition.hxx | 2 | ||||
| -rw-r--r-- | src/Playlist.hxx | 3 | ||||
| -rw-r--r-- | src/PlaylistUpdate.cxx | 10 |
5 files changed, 9 insertions, 13 deletions
diff --git a/src/Instance.cxx b/src/Instance.cxx index 621b0d669..229af0268 100644 --- a/src/Instance.cxx +++ b/src/Instance.cxx @@ -22,6 +22,7 @@ #include "Partition.hxx" #include "Idle.hxx" #include "Stats.hxx" +#include "db/DatabaseGlue.hxx" #ifdef ENABLE_DATABASE @@ -35,7 +36,7 @@ void Instance::DatabaseModified() { stats_invalidate(); - partition->DatabaseModified(); + partition->DatabaseModified(*GetDatabase()); idle_add(IDLE_DATABASE); } diff --git a/src/Partition.cxx b/src/Partition.cxx index f12f931be..4d4504338 100644 --- a/src/Partition.cxx +++ b/src/Partition.cxx @@ -25,9 +25,9 @@ #ifdef ENABLE_DATABASE void -Partition::DatabaseModified() +Partition::DatabaseModified(const Database &db) { - playlist.DatabaseModified(); + playlist.DatabaseModified(db); } #endif diff --git a/src/Partition.hxx b/src/Partition.hxx index 1faf7c9a2..de41162f3 100644 --- a/src/Partition.hxx +++ b/src/Partition.hxx @@ -178,7 +178,7 @@ struct Partition { * The database has been modified. Propagate the change to * all subsystems. */ - void DatabaseModified(); + void DatabaseModified(const Database &db); #endif /** diff --git a/src/Playlist.hxx b/src/Playlist.hxx index 41811fe59..45f1e2dfc 100644 --- a/src/Playlist.hxx +++ b/src/Playlist.hxx @@ -26,6 +26,7 @@ enum TagType : uint8_t; struct PlayerControl; class DetachedSong; +class Database; class Error; struct playlist { @@ -141,7 +142,7 @@ public: /** * The database has been modified. Pull all updates. */ - void DatabaseModified(); + void DatabaseModified(const Database &db); #endif PlaylistResult AppendSong(PlayerControl &pc, diff --git a/src/PlaylistUpdate.cxx b/src/PlaylistUpdate.cxx index 114305960..89132ca7b 100644 --- a/src/PlaylistUpdate.cxx +++ b/src/PlaylistUpdate.cxx @@ -19,7 +19,6 @@ #include "config.h" #include "Playlist.hxx" -#include "db/DatabaseGlue.hxx" #include "db/DatabasePlugin.hxx" #include "db/LightSong.hxx" #include "DetachedSong.hxx" @@ -56,17 +55,12 @@ UpdatePlaylistSong(const Database &db, DetachedSong &song) } 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; } |