Partial revert commit af67de8
This commit is contained in:
parent
e043a03eb6
commit
ff73dd2183
|
@ -30,6 +30,7 @@
|
|||
#include <QtConcurrent>
|
||||
#include <QThread>
|
||||
#include <QMutex>
|
||||
#include <QFuture>
|
||||
#include <QDataStream>
|
||||
#include <QMimeData>
|
||||
#include <QIODevice>
|
||||
|
@ -51,6 +52,7 @@
|
|||
#include <QtDebug>
|
||||
|
||||
#include "core/application.h"
|
||||
#include "core/closure.h"
|
||||
#include "core/database.h"
|
||||
#include "core/iconloader.h"
|
||||
#include "core/logging.h"
|
||||
|
@ -857,15 +859,18 @@ void CollectionModel::LazyPopulate(CollectionItem *parent, const bool signal) {
|
|||
}
|
||||
|
||||
void CollectionModel::ResetAsync() {
|
||||
(void)QtConcurrent::run([=]() { ResetAsyncQueryFinished(RunQuery(root_)); });
|
||||
QFuture<CollectionModel::QueryResult> future = QtConcurrent::run(this, &CollectionModel::RunQuery, root_);
|
||||
NewClosure(future, this, SLOT(ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResult>)), future);
|
||||
}
|
||||
|
||||
void CollectionModel::ResetAsyncQueryFinished(QueryResult result) {
|
||||
void CollectionModel::ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResult> future) {
|
||||
|
||||
if (QThread::currentThread() != thread() && QThread::currentThread() != backend_->thread()) {
|
||||
backend_->Close();
|
||||
}
|
||||
|
||||
const struct QueryResult result = future.result();
|
||||
|
||||
BeginReset();
|
||||
root_->lazy_loaded = true;
|
||||
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <QtGlobal>
|
||||
#include <QObject>
|
||||
#include <QAbstractItemModel>
|
||||
#include <QFuture>
|
||||
#include <QDataStream>
|
||||
#include <QMetaType>
|
||||
#include <QPair>
|
||||
|
@ -212,7 +213,7 @@ class CollectionModel : public SimpleTreeModel<CollectionItem> {
|
|||
void ClearDiskCache();
|
||||
|
||||
// Called after ResetAsync
|
||||
void ResetAsyncQueryFinished(QueryResult result);
|
||||
void ResetAsyncQueryFinished(QFuture<CollectionModel::QueryResult> future);
|
||||
|
||||
void AlbumCoverLoaded(const quint64 id, const AlbumCoverLoaderResult &result);
|
||||
|
||||
|
|
|
@ -26,6 +26,7 @@
|
|||
|
||||
#include <QtGlobal>
|
||||
#include <QtConcurrent>
|
||||
#include <QFuture>
|
||||
#include <QObject>
|
||||
#include <QWidget>
|
||||
#include <QDialog>
|
||||
|
@ -285,15 +286,16 @@ void EditTagDialog::SetSongs(const SongList &s, const PlaylistItemList &items) {
|
|||
ui_->song_list->clear();
|
||||
|
||||
// Reload tags in the background
|
||||
(void)QtConcurrent::run([=]{ SetSongsFinished(LoadData(s)); });
|
||||
QFuture<QList<Data>> future = QtConcurrent::run(this, &EditTagDialog::LoadData, s);
|
||||
NewClosure(future, this, SLOT(SetSongsFinished(QFuture<QList<EditTagDialog::Data>>)), future);
|
||||
|
||||
}
|
||||
|
||||
void EditTagDialog::SetSongsFinished(QList<Data> _data) {
|
||||
void EditTagDialog::SetSongsFinished(QFuture<QList<Data>> future) {
|
||||
|
||||
if (!SetLoading(QString())) return;
|
||||
|
||||
data_ = _data;
|
||||
data_ = future.result();
|
||||
if (data_.count() == 0) {
|
||||
// If there were no valid songs, disable everything
|
||||
ui_->song_list->setEnabled(false);
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
#include <QObject>
|
||||
#include <QAbstractItemModel>
|
||||
#include <QDialog>
|
||||
#include <QFuture>
|
||||
#include <QList>
|
||||
#include <QVariant>
|
||||
#include <QString>
|
||||
|
@ -99,7 +100,7 @@ class EditTagDialog : public QDialog {
|
|||
};
|
||||
|
||||
private slots:
|
||||
void SetSongsFinished(QList<Data> _data);
|
||||
void SetSongsFinished(QFuture<QList<EditTagDialog::Data>> future);
|
||||
void AcceptFinished();
|
||||
|
||||
void SelectionChanged();
|
||||
|
|
|
@ -344,9 +344,10 @@ bool OrganiseDialog::SetUrls(const QList<QUrl> &urls) {
|
|||
|
||||
bool OrganiseDialog::SetFilenames(const QStringList &filenames) {
|
||||
|
||||
SetLoadingSongs(true);
|
||||
songs_future_ = QtConcurrent::run([=]{ SetSongs(LoadSongsBlocking(filenames)); });
|
||||
songs_future_ = QtConcurrent::run(this, &OrganiseDialog::LoadSongsBlocking, filenames);
|
||||
NewClosure(songs_future_, [=]() { SetSongs(songs_future_.result()); });
|
||||
|
||||
SetLoadingSongs(true);
|
||||
return true;
|
||||
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ class OrganiseDialog : public QDialog {
|
|||
|
||||
OrganiseFormat format_;
|
||||
|
||||
QFuture<void> songs_future_;
|
||||
QFuture<SongList> songs_future_;
|
||||
SongList songs_;
|
||||
Organise::NewSongInfoList new_songs_info_;
|
||||
quint64 total_size_;
|
||||
|
|
|
@ -1314,15 +1314,17 @@ void Playlist::Restore() {
|
|||
collection_items_by_id_.clear();
|
||||
|
||||
cancel_restore_ = false;
|
||||
|
||||
(void)QtConcurrent::run([=]() { ItemsLoaded(backend_->GetPlaylistItems(id_)); });
|
||||
QFuture<QList<PlaylistItemPtr>> future = QtConcurrent::run(backend_, &PlaylistBackend::GetPlaylistItems, id_);
|
||||
NewClosure(future, this, SLOT(ItemsLoaded(QFuture<PlaylistItemList>)), future);
|
||||
|
||||
}
|
||||
|
||||
void Playlist::ItemsLoaded(PlaylistItemList items) {
|
||||
void Playlist::ItemsLoaded(QFuture<PlaylistItemList> future) {
|
||||
|
||||
if (cancel_restore_) return;
|
||||
|
||||
PlaylistItemList items = future.result();
|
||||
|
||||
// Backend returns empty elements for collection items which it couldn't match (because they got deleted); we don't need those
|
||||
QMutableListIterator<PlaylistItemPtr> it(items);
|
||||
while (it.hasNext()) {
|
||||
|
@ -1351,7 +1353,7 @@ void Playlist::ItemsLoaded(PlaylistItemList items) {
|
|||
|
||||
// Should we gray out deleted songs asynchronously on startup?
|
||||
if (greyout) {
|
||||
(void)QtConcurrent::run([=]() { InvalidateDeletedSongs(); });
|
||||
QtConcurrent::run(this, &Playlist::InvalidateDeletedSongs);
|
||||
}
|
||||
|
||||
emit PlaylistLoaded();
|
||||
|
|
|
@ -29,6 +29,7 @@
|
|||
#include <QAbstractItemModel>
|
||||
#include <QAbstractListModel>
|
||||
#include <QPersistentModelIndex>
|
||||
#include <QFuture>
|
||||
#include <QList>
|
||||
#include <QMap>
|
||||
#include <QMultiMap>
|
||||
|
@ -348,7 +349,7 @@ class Playlist : public QAbstractListModel {
|
|||
void QueueLayoutChanged();
|
||||
void SongSaveComplete(TagReaderReply *reply, const QPersistentModelIndex &index);
|
||||
void ItemReloadComplete(const QPersistentModelIndex &index);
|
||||
void ItemsLoaded(PlaylistItemList items);
|
||||
void ItemsLoaded(QFuture<PlaylistItemList> future);
|
||||
void SongInsertVetoListenerDestroyed();
|
||||
void AlbumCoverLoaded(const Song &song, const AlbumCoverLoaderResult &result);
|
||||
|
||||
|
|
|
@ -42,6 +42,7 @@
|
|||
#include <QtDebug>
|
||||
|
||||
#include "core/application.h"
|
||||
#include "core/closure.h"
|
||||
#include "core/logging.h"
|
||||
#include "core/player.h"
|
||||
#include "core/utilities.h"
|
||||
|
@ -210,11 +211,18 @@ void PlaylistManager::Save(int id, const QString &filename, Playlist::Path path_
|
|||
}
|
||||
else {
|
||||
// Playlist is not in the playlist manager: probably save action was triggered from the left side bar and the playlist isn't loaded.
|
||||
(void)QtConcurrent::run([=]() { parser_->Save(playlist_backend_->GetPlaylistSongs(id), filename, path_type); });
|
||||
QFuture<QList<Song>> future = QtConcurrent::run(playlist_backend_, &PlaylistBackend::GetPlaylistSongs, id);
|
||||
NewClosure(future, this, SLOT(ItemsLoadedForSavePlaylist(QFuture<SongList>, QString, Playlist::Path)), future, filename, path_type);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void PlaylistManager::ItemsLoadedForSavePlaylist(QFuture<SongList> future, const QString &filename, Playlist::Path path_type) {
|
||||
|
||||
parser_->Save(future.result(), filename, path_type);
|
||||
|
||||
}
|
||||
|
||||
void PlaylistManager::SaveWithUI(int id, const QString &playlist_name) {
|
||||
|
||||
QSettings settings;
|
||||
|
|
|
@ -215,6 +215,7 @@ class PlaylistManager : public PlaylistManagerInterface {
|
|||
void OneOfPlaylistsChanged();
|
||||
void UpdateSummaryText();
|
||||
void SongsDiscovered(const SongList& songs);
|
||||
void ItemsLoadedForSavePlaylist(QFuture<SongList> future, const QString& filename, Playlist::Path path_type);
|
||||
void PlaylistLoaded();
|
||||
|
||||
private:
|
||||
|
|
|
@ -83,7 +83,7 @@ void SongLoaderInserter::Load(Playlist *destination, int row, bool play_now, boo
|
|||
deleteLater();
|
||||
}
|
||||
else {
|
||||
(void)QtConcurrent::run([=]{ AsyncLoad(); });
|
||||
QtConcurrent::run(this, &SongLoaderInserter::AsyncLoad);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue