Refactoring
This commit is contained in:
@@ -38,11 +38,12 @@
|
||||
#include <QStringList>
|
||||
#include <QUrl>
|
||||
|
||||
#include "shared_ptr.h"
|
||||
#include "song.h"
|
||||
#include "includes/shared_ptr.h"
|
||||
#include "core/song.h"
|
||||
|
||||
class QTimer;
|
||||
class Player;
|
||||
class UrlHandlers;
|
||||
class TagReaderClient;
|
||||
class CollectionBackendInterface;
|
||||
class PlaylistParser;
|
||||
class ParserBase;
|
||||
@@ -56,7 +57,11 @@ class SongLoader : public QObject {
|
||||
Q_OBJECT
|
||||
|
||||
public:
|
||||
explicit SongLoader(SharedPtr<CollectionBackendInterface> collection_backend, const SharedPtr<Player> player, QObject *parent = nullptr);
|
||||
explicit SongLoader(const SharedPtr<UrlHandlers> url_handlers,
|
||||
const SharedPtr<CollectionBackendInterface> collection_backend,
|
||||
const SharedPtr<TagReaderClient> tagreader_client,
|
||||
QObject *parent = nullptr);
|
||||
|
||||
~SongLoader() override;
|
||||
|
||||
enum class Result {
|
||||
@@ -137,8 +142,9 @@ class SongLoader : public QObject {
|
||||
QUrl url_;
|
||||
SongList songs_;
|
||||
|
||||
const SharedPtr<Player> player_;
|
||||
SharedPtr<CollectionBackendInterface> collection_backend_;
|
||||
const SharedPtr<UrlHandlers> url_handlers_;
|
||||
const SharedPtr<CollectionBackendInterface> collection_backend_;
|
||||
const SharedPtr<TagReaderClient> tagreader_client_;
|
||||
QTimer *timeout_timer_;
|
||||
PlaylistParser *playlist_parser_;
|
||||
CueParser *cue_parser_;
|
||||
|
||||
Reference in New Issue
Block a user