Remove NetworkAccessManager from song loader

This commit is contained in:
Jonas Kvinge
2023-04-22 14:05:48 +02:00
parent c96498758f
commit 60bbd71a22
8 changed files with 14 additions and 24 deletions

View File

@@ -25,7 +25,6 @@
#include <QUrl>
#include "core/application.h"
#include "core/networkaccessmanager.h"
#include "collection/collectionmodel.h"
#include "cddasongloader.h"
#include "connecteddevice.h"
@@ -37,7 +36,7 @@ class DeviceManager;
CddaDevice::CddaDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, DeviceManager *manager, Application *app, int database_id, bool first_time, QObject *parent)
: ConnectedDevice(url, lister, unique_id, manager, app, database_id, first_time, parent),
cdda_song_loader_(url, app->network()) {
cdda_song_loader_(url) {
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsLoaded, this, &CddaDevice::SongsLoaded);
QObject::connect(&cdda_song_loader_, &CddaSongLoader::SongsDurationLoaded, this, &CddaDevice::SongsLoaded);

View File

@@ -42,10 +42,10 @@
#include "core/networkaccessmanager.h"
#include "utilities/timeconstants.h"
CddaSongLoader::CddaSongLoader(const QUrl &url, NetworkAccessManager *network, QObject *parent)
CddaSongLoader::CddaSongLoader(const QUrl &url, QObject *parent)
: QObject(parent),
url_(url),
network_(network),
network_(new NetworkAccessManager(this)),
cdda_(nullptr),
cdio_(nullptr) {}

View File

@@ -47,7 +47,7 @@ class CddaSongLoader : public QObject {
Q_OBJECT
public:
explicit CddaSongLoader(const QUrl &url, NetworkAccessManager *network, QObject *parent = nullptr);
explicit CddaSongLoader(const QUrl &url, QObject *parent = nullptr);
~CddaSongLoader() override;
// Load songs. Signals declared below will be emitted anytime new information will be available.