Refactoring

src/scrobbler/subsonicscrobbler.cpp

@@ -27,16 +27,15 @@
 #include <QDateTime>
 #include <QTimer>
 
-#include "core/shared_ptr.h"
-#include "core/application.h"
+#include "includes/shared_ptr.h"
 #include "core/song.h"
 #include "core/logging.h"
-#include "utilities/timeconstants.h"
-#include "settings/subsonicsettingspage.h"
-#include "streaming/streamingservices.h"
+#include "core/settings.h"
+#include "constants/timeconstants.h"
+#include "constants/subsonicsettings.h"
 #include "subsonic/subsonicservice.h"
 
-#include "scrobblersettings.h"
+#include "scrobblersettingsservice.h"
 #include "scrobblerservice.h"
 #include "subsonicscrobbler.h"
 
@@ -44,10 +43,9 @@ namespace {
 constexpr char kName[] = "Subsonic";
 }
 
-SubsonicScrobbler::SubsonicScrobbler(SharedPtr<ScrobblerSettings> settings, Application *app, QObject *parent)
+SubsonicScrobbler::SubsonicScrobbler(const SharedPtr<ScrobblerSettingsService> settings, const SharedPtr<SubsonicService> service, QObject *parent)
     : ScrobblerService(QLatin1String(kName), settings, parent),
-      app_(app),
-      service_(nullptr),
+      service_(service),
       enabled_(false),
       submitted_(false) {
 
@@ -61,17 +59,13 @@ SubsonicScrobbler::SubsonicScrobbler(SharedPtr<ScrobblerSettings> settings, Appl
 void SubsonicScrobbler::ReloadSettings() {
 
   Settings s;
-  s.beginGroup(SubsonicSettingsPage::kSettingsGroup);
+  s.beginGroup(SubsonicSettings::kSettingsGroup);
   enabled_ = s.value("serversidescrobbling", false).toBool();
   s.endGroup();
 
 }
 
-SubsonicServicePtr SubsonicScrobbler::service() {
-
-  if (!service_) {
-    service_ = app_->streaming_services()->Service<SubsonicService>();
-  }
+SubsonicServicePtr SubsonicScrobbler::service() const {
 
   return service_;