Refactoring
This commit is contained in:
@@ -23,15 +23,15 @@
|
||||
#include <QString>
|
||||
#include <QUrl>
|
||||
|
||||
#include "core/application.h"
|
||||
#include "includes/shared_ptr.h"
|
||||
#include "core/taskmanager.h"
|
||||
#include "core/song.h"
|
||||
#include "tidal/tidalservice.h"
|
||||
#include "tidalurlhandler.h"
|
||||
|
||||
TidalUrlHandler::TidalUrlHandler(Application *app, TidalService *service)
|
||||
TidalUrlHandler::TidalUrlHandler(const SharedPtr<TaskManager> task_manager, TidalService *service)
|
||||
: UrlHandler(service),
|
||||
app_(app),
|
||||
task_manager_(task_manager),
|
||||
service_(service) {
|
||||
|
||||
QObject::connect(service, &TidalService::StreamURLFailure, this, &TidalUrlHandler::GetStreamURLFailure);
|
||||
@@ -42,7 +42,7 @@ TidalUrlHandler::TidalUrlHandler(Application *app, TidalService *service)
|
||||
UrlHandler::LoadResult TidalUrlHandler::StartLoading(const QUrl &url) {
|
||||
|
||||
Request req;
|
||||
req.task_id = app_->task_manager()->StartTask(QStringLiteral("Loading %1 stream...").arg(url.scheme()));
|
||||
req.task_id = task_manager_->StartTask(QStringLiteral("Loading %1 stream...").arg(url.scheme()));
|
||||
QString error;
|
||||
req.id = service_->GetStreamURL(url, error);
|
||||
if (req.id == 0) {
|
||||
@@ -80,5 +80,5 @@ void TidalUrlHandler::GetStreamURLSuccess(const uint id, const QUrl &media_url,
|
||||
}
|
||||
|
||||
void TidalUrlHandler::CancelTask(const int task_id) {
|
||||
app_->task_manager()->SetTaskFinished(task_id);
|
||||
task_manager_->SetTaskFinished(task_id);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user