Funkwhale
/
strawberry-audio-player-windows-mac-linux
mirror of https://github.com/strawberrymusicplayer/strawberry
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix crash in tidal service

This commit is contained in:
Jonas Kvinge 2019-05-31 02:32:01 +02:00
parent 699e8e3ddb
commit e5fde27859
1 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/tidal/tidalservice.cpp
View File

@ -76,12 +76,12 @@ TidalService::TidalService(Application *app, QObject *parent)
app_(app), app_(app),
network_(new NetworkAccessManager(this)), network_(new NetworkAccessManager(this)),
url_handler_(new TidalUrlHandler(app, this)), url_handler_(new TidalUrlHandler(app, this)),
artists_collection_backend_(new CollectionBackend()), artists_collection_backend_(nullptr),
albums_collection_backend_(new CollectionBackend()), albums_collection_backend_(nullptr),
songs_collection_backend_(new CollectionBackend()), songs_collection_backend_(nullptr),
artists_collection_model_(new CollectionModel(artists_collection_backend_, app_, this)), artists_collection_model_(nullptr),
albums_collection_model_(new CollectionModel(albums_collection_backend_, app_, this)), albums_collection_model_(nullptr),
songs_collection_model_(new CollectionModel(songs_collection_backend_, app_, this)), songs_collection_model_(nullptr),
artists_collection_sort_model_(new QSortFilterProxyModel(this)), artists_collection_sort_model_(new QSortFilterProxyModel(this)),
albums_collection_sort_model_(new QSortFilterProxyModel(this)), albums_collection_sort_model_(new QSortFilterProxyModel(this)),
songs_collection_sort_model_(new QSortFilterProxyModel(this)), songs_collection_sort_model_(new QSortFilterProxyModel(this)),
@ -105,15 +105,22 @@ TidalService::TidalService(Application *app, QObject *parent)
// Backends // Backends
artists_collection_backend_ = new CollectionBackend();
artists_collection_backend_->moveToThread(app_->database()->thread()); artists_collection_backend_->moveToThread(app_->database()->thread());
artists_collection_backend_->Init(app_->database(), kArtistsSongsTable, QString(), QString(), kArtistsSongsFtsTable); artists_collection_backend_->Init(app_->database(), kArtistsSongsTable, QString(), QString(), kArtistsSongsFtsTable);
albums_collection_backend_ = new CollectionBackend();
albums_collection_backend_->moveToThread(app_->database()->thread()); albums_collection_backend_->moveToThread(app_->database()->thread());
albums_collection_backend_->Init(app_->database(), kAlbumsSongsTable, QString(), QString(), kAlbumsSongsFtsTable); albums_collection_backend_->Init(app_->database(), kAlbumsSongsTable, QString(), QString(), kAlbumsSongsFtsTable);
songs_collection_backend_ = new CollectionBackend();
songs_collection_backend_->moveToThread(app_->database()->thread()); songs_collection_backend_->moveToThread(app_->database()->thread());
songs_collection_backend_->Init(app_->database(), kSongsTable, QString(), QString(), kSongsFtsTable); songs_collection_backend_->Init(app_->database(), kSongsTable, QString(), QString(), kSongsFtsTable);
artists_collection_model_ = new CollectionModel(artists_collection_backend_, app_, this);
albums_collection_model_ = new CollectionModel(albums_collection_backend_, app_, this);
songs_collection_model_ = new CollectionModel(songs_collection_backend_, app_, this);
artists_collection_sort_model_->setSourceModel(artists_collection_model_); artists_collection_sort_model_->setSourceModel(artists_collection_model_);
artists_collection_sort_model_->setSortRole(CollectionModel::Role_SortText); artists_collection_sort_model_->setSortRole(CollectionModel::Role_SortText);
artists_collection_sort_model_->setDynamicSortFilter(true); artists_collection_sort_model_->setDynamicSortFilter(true);