Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
mirror of https://github.com/strawberrymusicplayer/strawberry synced 2024-12-15 10:14:43 +01:00
Code Issues Releases Wiki Activity

Rename FindSongs

Browse Source
This commit is contained in:
Jonas Kvinge 2021-06-28 00:16:22 +02:00
parent 9ace66edb7
commit 062c59b321
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/collection/collectionbackend.cpp
View File

@ -1444,7 +1444,7 @@ void CollectionBackend::DeleteAll() {
} }
SongList CollectionBackend::FindSongs(const SmartPlaylistSearch &search) { SongList CollectionBackend::SmartPlaylistsFindSongs(const SmartPlaylistSearch &search) {
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect()); QSqlDatabase db(db_->Connect());
@ -1469,10 +1469,10 @@ SongList CollectionBackend::FindSongs(const SmartPlaylistSearch &search) {
} }
SongList CollectionBackend::GetAllSongs() { SongList CollectionBackend::SmartPlaylistsGetAllSongs() {
// Get all the songs! // Get all the songs!
return FindSongs(SmartPlaylistSearch(SmartPlaylistSearch::Type_All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::Sort_FieldAsc, SmartPlaylistSearchTerm::Field_Artist, -1)); return SmartPlaylistsFindSongs(SmartPlaylistSearch(SmartPlaylistSearch::Type_All, SmartPlaylistSearch::TermList(), SmartPlaylistSearch::Sort_FieldAsc, SmartPlaylistSearchTerm::Field_Artist, -1));
} }

4
src/collection/collectionbackend.h
View File

@ -193,8 +193,8 @@ class CollectionBackend : public CollectionBackendInterface {
SongList GetSongsByFingerprint(const QString &fingerprint) override; SongList GetSongsByFingerprint(const QString &fingerprint) override;
SongList GetAllSongs(); SongList SmartPlaylistsGetAllSongs();
SongList FindSongs(const SmartPlaylistSearch &search); SongList SmartPlaylistsFindSongs(const SmartPlaylistSearch &search);
Song::Source Source() const; Song::Source Source() const;

2
src/smartplaylists/playlistquerygenerator.cpp
View File

@ -86,7 +86,7 @@ PlaylistItemList PlaylistQueryGenerator::GenerateMore(const int count) {
current_pos_ += search_copy.limit_; current_pos_ += search_copy.limit_;
} }
SongList songs = backend_->FindSongs(search_copy); SongList songs = backend_->SmartPlaylistsFindSongs(search_copy);
PlaylistItemList items; PlaylistItemList items;
items.reserve(songs.count()); items.reserve(songs.count());
for (const Song &song : songs) { for (const Song &song : songs) {