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

Remove NetworkAccessManager from song loader

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/songloader.cpp
View File

@@ -46,7 +46,6 @@
#include "signalchecker.h"
#include "player.h"
#include "networkaccessmanager.h"
#include "song.h"
#include "songloader.h"
#include "tagreaderclient.h"
@@ -67,10 +66,9 @@
QSet<QString> SongLoader::sRawUriSchemes;
const int SongLoader::kDefaultTimeout = 5000;
SongLoader::SongLoader(CollectionBackendInterface *collection, const Player *player, NetworkAccessManager *network, QObject *parent)
SongLoader::SongLoader(CollectionBackendInterface *collection, const Player *player, QObject *parent)
: QObject(parent),
player_(player),
network_(network),
collection_(collection),
timeout_timer_(new QTimer(this)),
playlist_parser_(new PlaylistParser(collection, this)),
@@ -193,7 +191,7 @@ SongLoader::Result SongLoader::LoadAudioCD() {
#if defined(HAVE_AUDIOCD) && defined(HAVE_GSTREAMER)
if (player_->engine()->type() == Engine::EngineType::GStreamer) {
CddaSongLoader *cdda_song_loader = new CddaSongLoader(QUrl(), network_, this);
CddaSongLoader *cdda_song_loader = new CddaSongLoader(QUrl(), this);
QObject::connect(cdda_song_loader, &CddaSongLoader::SongsDurationLoaded, this, &SongLoader::AudioCDTracksLoadFinishedSlot);
QObject::connect(cdda_song_loader, &CddaSongLoader::SongsMetadataLoaded, this, &SongLoader::AudioCDTracksTagsLoaded);
cdda_song_loader->LoadSongs();

4
src/core/songloader.h
View File

@@ -45,7 +45,6 @@
class QTimer;
class Player;
class NetworkAccessManager;
class CollectionBackendInterface;
class PlaylistParser;
class ParserBase;
@@ -59,7 +58,7 @@ class SongLoader : public QObject {
Q_OBJECT
public:
explicit SongLoader(CollectionBackendInterface *collection, const Player *player, NetworkAccessManager *network, QObject *parent = nullptr);
explicit SongLoader(CollectionBackendInterface *collection, const Player *player, QObject *parent = nullptr);
~SongLoader() override;
enum class Result {
@@ -145,7 +144,6 @@ class SongLoader : public QObject {
SongList songs_;
const Player *player_;
NetworkAccessManager *network_;
CollectionBackendInterface *collection_;
QTimer *timeout_timer_;
PlaylistParser *playlist_parser_;