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

Revert some lambda connects back to NewClosure

Browse Source
This commit is contained in:
Jonas Kvinge
2021-01-28 21:22:50 +01:00
parent 8ac5b55b3a
commit 819800d3a4
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/moodbar/moodbarcontroller.cpp
View File

@@ -24,6 +24,7 @@
#include "core/application.h" #include "core/application.h"
#include "core/player.h" #include "core/player.h"
#include "core/song.h" #include "core/song.h"
#include "core/closure.h"
#include "engine/engine_fwd.h" #include "engine/engine_fwd.h"
#include "settings/moodbarsettingspage.h" #include "settings/moodbarsettingspage.h"
#include "playlist/playlistmanager.h" #include "playlist/playlistmanager.h"
@@ -75,7 +76,7 @@ void MoodbarController::CurrentSongChanged(const Song &song) {
// bar. Our slot will be called when the data is actually loaded. // bar. Our slot will be called when the data is actually loaded.
emit CurrentMoodbarDataChanged(QByteArray()); emit CurrentMoodbarDataChanged(QByteArray());
QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, pipeline, song]() { AsyncLoadComplete(pipeline, song.url()); }); NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(AsyncLoadComplete(MoodbarPipeline*, QUrl)), pipeline, song.url());
break; break;
} }

2
src/moodbar/moodbaritemdelegate.cpp
View File

@@ -145,7 +145,7 @@ void MoodbarItemDelegate::StartLoadingData(const QUrl &url, Data *data) {
case MoodbarLoader::WillLoadAsync: case MoodbarLoader::WillLoadAsync:
// Maybe in a little while. // Maybe in a little while.
QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, url, pipeline]() { DataLoaded(url, pipeline); }); NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(DataLoaded(QUrl, MoodbarPipeline*)), url, pipeline);
break; break;
} }

3
src/moodbar/moodbarloader.cpp
View File

@@ -39,6 +39,7 @@
#include <QtDebug> #include <QtDebug>
#include "core/application.h" #include "core/application.h"
#include "core/closure.h"
#include "core/logging.h" #include "core/logging.h"
#include "moodbarpipeline.h" #include "moodbarpipeline.h"
@@ -129,7 +130,7 @@ MoodbarLoader::Result MoodbarLoader::Load(const QUrl &url, QByteArray *data, Moo
// There was no existing file, analyze the audio file and create one. // There was no existing file, analyze the audio file and create one.
MoodbarPipeline *pipeline = new MoodbarPipeline(url); MoodbarPipeline *pipeline = new MoodbarPipeline(url);
pipeline->moveToThread(thread_); pipeline->moveToThread(thread_);
QObject::connect(pipeline, &MoodbarPipeline::Finished, [this, pipeline, url]() { RequestFinished(pipeline, url); }); NewClosure(pipeline, SIGNAL(Finished(bool)), this, SLOT(RequestFinished(MoodbarPipeline*, QUrl)), pipeline, url);
requests_[url] = pipeline; requests_[url] = pipeline;
queued_requests_ << url; queued_requests_ << url;