From 0c743452b014d3e8e342d0300519659c56a84186 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Wed, 23 Sep 2020 18:55:22 +0200 Subject: [PATCH] Only compile Subsonic scrobbler when compiled with Subsonic support --- src/CMakeLists.txt | 4 ++-- src/scrobbler/audioscrobbler.cpp | 6 +++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 6c0e56cd9..4a83ac8b8 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -242,7 +242,6 @@ set(SOURCES scrobbler/librefmscrobbler.cpp scrobbler/listenbrainzscrobbler.cpp scrobbler/lastfmimport.cpp - scrobbler/subsonicscrobbler.cpp organize/organize.cpp organize/organizeformat.cpp @@ -457,7 +456,6 @@ set(HEADERS scrobbler/librefmscrobbler.h scrobbler/listenbrainzscrobbler.h scrobbler/lastfmimport.h - scrobbler/subsonicscrobbler.h organize/organize.h organize/organizedialog.h @@ -907,6 +905,7 @@ optional_source(HAVE_SUBSONIC subsonic/subsonicrequest.cpp subsonic/subsonicscrobblerequest.cpp settings/subsonicsettingspage.cpp + scrobbler/subsonicscrobbler.cpp HEADERS subsonic/subsonicservice.h subsonic/subsonicurlhandler.h @@ -914,6 +913,7 @@ optional_source(HAVE_SUBSONIC subsonic/subsonicrequest.h subsonic/subsonicscrobblerequest.h settings/subsonicsettingspage.h + scrobbler/subsonicscrobbler.h UI settings/subsonicsettingspage.ui ) diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp index 70ca2b677..18c852445 100644 --- a/src/scrobbler/audioscrobbler.cpp +++ b/src/scrobbler/audioscrobbler.cpp @@ -37,7 +37,9 @@ #include "lastfmscrobbler.h" #include "librefmscrobbler.h" #include "listenbrainzscrobbler.h" -#include "subsonicscrobbler.h" +#ifdef HAVE_SUBSONIC +# include "subsonicscrobbler.h" +#endif AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) : QObject(parent), @@ -55,7 +57,9 @@ AudioScrobbler::AudioScrobbler(Application *app, QObject *parent) : scrobbler_services_->AddService(new LastFMScrobbler(app_, scrobbler_services_)); scrobbler_services_->AddService(new LibreFMScrobbler(app_, scrobbler_services_)); scrobbler_services_->AddService(new ListenBrainzScrobbler(app_, scrobbler_services_)); +#ifdef HAVE_SUBSONIC scrobbler_services_->AddService(new SubsonicScrobbler(app_, scrobbler_services_)); +#endif ReloadSettings();