dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CollectionBackend: Rename source accessor

Browse Source
This commit is contained in:
Jonas Kvinge
2022-10-19 17:11:56 +02:00
parent ec99df3144
commit 54fc11a235
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/collection/collectionbackend.cpp
View File

@@ -1314,10 +1314,6 @@ SongList CollectionBackend::GetCompilationSongs(const QString &album, const Quer
} }
Song::Source CollectionBackend::Source() const {
return source_;
}
void CollectionBackend::CompilationsNeedUpdating() { void CollectionBackend::CompilationsNeedUpdating() {
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());

6
src/collection/collectionbackend.h
View File

@@ -77,6 +77,8 @@ class CollectionBackendInterface : public QObject {
virtual QString songs_table() const = 0; virtual QString songs_table() const = 0;
virtual QString fts_table() const = 0; virtual QString fts_table() const = 0;
virtual Song::Source source() const = 0;
virtual Database *db() const = 0; virtual Database *db() const = 0;
// Get a list of directories in the collection. Emits DirectoriesDiscovered. // Get a list of directories in the collection. Emits DirectoriesDiscovered.
@@ -139,6 +141,8 @@ class CollectionBackend : public CollectionBackendInterface {
void ReportErrors(const CollectionQuery &query); void ReportErrors(const CollectionQuery &query);
Song::Source source() const override { return source_; }
Database *db() const override { return db_; } Database *db() const override { return db_; }
QString songs_table() const override { return songs_table_; } QString songs_table() const override { return songs_table_; }
@@ -207,8 +211,6 @@ class CollectionBackend : public CollectionBackendInterface {
SongList SmartPlaylistsGetAllSongs(); SongList SmartPlaylistsGetAllSongs();
SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search); SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search);
Song::Source Source() const;
void AddOrUpdateSongsAsync(const SongList &songs); void AddOrUpdateSongsAsync(const SongList &songs);
void UpdateSongsBySongIDAsync(const SongMap &new_songs); void UpdateSongsBySongIDAsync(const SongMap &new_songs);

2
src/collection/collectionmodel.cpp
View File

@@ -608,7 +608,7 @@ QString CollectionModel::AlbumIconPixmapCacheKey(const QModelIndex &idx) const {
idx_copy = idx_copy.parent(); idx_copy = idx_copy.parent();
} }
return Song::TextForSource(backend_->Source()) + "/" + path.join("/"); return Song::TextForSource(backend_->source()) + "/" + path.join("/");
} }