diff --git a/src/collection/collectionbackend.cpp b/src/collection/collectionbackend.cpp index 9f97fd356..45c9e32b0 100644 --- a/src/collection/collectionbackend.cpp +++ b/src/collection/collectionbackend.cpp @@ -1314,10 +1314,6 @@ SongList CollectionBackend::GetCompilationSongs(const QString &album, const Quer } -Song::Source CollectionBackend::Source() const { - return source_; -} - void CollectionBackend::CompilationsNeedUpdating() { QMutexLocker l(db_->Mutex()); diff --git a/src/collection/collectionbackend.h b/src/collection/collectionbackend.h index eaa8a4e0f..d4a6ac8da 100644 --- a/src/collection/collectionbackend.h +++ b/src/collection/collectionbackend.h @@ -77,6 +77,8 @@ class CollectionBackendInterface : public QObject { virtual QString songs_table() const = 0; virtual QString fts_table() const = 0; + virtual Song::Source source() const = 0; + virtual Database *db() const = 0; // Get a list of directories in the collection. Emits DirectoriesDiscovered. @@ -139,6 +141,8 @@ class CollectionBackend : public CollectionBackendInterface { void ReportErrors(const CollectionQuery &query); + Song::Source source() const override { return source_; } + Database *db() const override { return db_; } QString songs_table() const override { return songs_table_; } @@ -207,8 +211,6 @@ class CollectionBackend : public CollectionBackendInterface { SongList SmartPlaylistsGetAllSongs(); SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search); - Song::Source Source() const; - void AddOrUpdateSongsAsync(const SongList &songs); void UpdateSongsBySongIDAsync(const SongMap &new_songs); diff --git a/src/collection/collectionmodel.cpp b/src/collection/collectionmodel.cpp index b94491f13..f98e6c62c 100644 --- a/src/collection/collectionmodel.cpp +++ b/src/collection/collectionmodel.cpp @@ -608,7 +608,7 @@ QString CollectionModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const { idx_copy = idx_copy.parent(); } - return Song::TextForSource(backend_->Source()) + "/" + path.join("/"); + return Song::TextForSource(backend_->source()) + "/" + path.join("/"); }