Refactoring

src/device/cddadevice.h

@@ -24,30 +24,42 @@
 
 #include "config.h"
 
+#include <cdio/cdio.h>
+#include <gst/audio/gstaudiocdsrc.h>
+
 #include <QObject>
 #include <QString>
 #include <QStringList>
 #include <QUrl>
 
-// These must come after Qt includes
-#include <cdio/cdio.h>
-#include <gst/audio/gstaudiocdsrc.h>
-
-#include "core/shared_ptr.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 #include "core/musicstorage.h"
 #include "cddasongloader.h"
 #include "connecteddevice.h"
 
-class Application;
 class DeviceLister;
 class DeviceManager;
+class TaskManager;
+class Database;
+class TagReaderClient;
+class AlbumCoverLoader;
 
 class CddaDevice : public ConnectedDevice {
   Q_OBJECT
 
  public:
-  Q_INVOKABLE explicit CddaDevice(const QUrl &url, DeviceLister *lister, const QString &unique_id, SharedPtr<DeviceManager> manager, Application *app, const int database_id, const bool first_time, QObject *parent = nullptr);
+  Q_INVOKABLE explicit CddaDevice(const QUrl &url,
+                                  DeviceLister *lister,
+                                  const QString &unique_id,
+                                  DeviceManager *device_manager,
+                                  const SharedPtr<TaskManager> task_manager,
+                                  const SharedPtr<Database> database,
+                                  const SharedPtr<TagReaderClient> tagreader_client,
+                                  const SharedPtr<AlbumCoverLoader> albumcover_loader,
+                                  const int database_id,
+                                  const bool first_time,
+                                  QObject *parent = nullptr);
 
   bool Init() override;
   void Refresh() override;