Disable scrollbing support, as auth changed.

Closes #1661
2021-01-03 10:15:42 +00:00
parent 11bb7571c9
commit 9df2a54761
9 changed files with 55 additions and 13 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -50,6 +50,7 @@ option(ENABLE_PROXY_CONFIG "Enable proxy config in settings dialog" ON)
 option(ENABLE_HTTP_SERVER "Enable internal HTTP server to play non-MPD files" ON)
 option(ENABLE_LIBVLC "Use libVLC for MPD HTTP stream playback (if ENABLE_HTTP_STREAM_PLAYBACK=ON)" OFF)
 option(ENABLE_CATEGORIZED_VIEW "Enable support for categorised view" OFF)
+option(ENABLE_SCROBBLING "Enable scrobbling" OFF)

 if (WIN32 OR APPLE OR HAIKU)
    option(ENABLE_DEVICES_SUPPORT "Enable suport for external devices" OFF)
@@ -349,14 +350,13 @@ set(CANTATA_SRCS ${CANTATA_SRCS}
    online/onlinesearchwidget.cpp online/podcastservice.cpp online/rssparser.cpp online/opmlparser.cpp online/podcastsearchdialog.cpp
    online/podcastsettingsdialog.cpp online/podcastwidget.cpp online/onlinesearchservice.cpp
    db/onlinedb.cpp
-    scrobbling/scrobbler.cpp scrobbling/pausabletimer.cpp scrobbling/scrobblingsettings.cpp scrobbling/scrobblinglove.cpp
    http/httpserver.cpp)
 set(CANTATA_UIS ${CANTATA_UIS}
    gui/initialsettingswizard.ui gui/mainwindow.ui gui/interfacesettings.ui gui/playbacksettings.ui gui/serversettings.ui gui/coverdialog.ui
    context/togglelist.ui context/othersettings.ui
    streams/digitallyimportedsettings.ui streams/streamssettings.ui
    playlists/playlistrule.ui playlists/playlistrules.ui
-    widgets/itemview.ui scrobbling/scrobblingsettings.ui)
+    widgets/itemview.ui)

 if (ENABLE_CATEGORIZED_VIEW)
    set(CANTATA_SRCS ${CANTATA_SRCS} widgets/categorizedview.cpp)
@@ -364,6 +364,10 @@ endif ()
 if (ENABLE_SIMPLE_MPD_SUPPORT)
    set(CANTATA_SRCS ${CANTATA_SRCS} mpd-interface/mpduser.cpp)
 endif ()
+if (ENABLE_SCROBBLING)
+    set(CANTATA_SRCS ${CANTATA_SRCS} scrobbling/scrobbler.cpp scrobbling/pausabletimer.cpp scrobbling/scrobblingsettings.cpp scrobbling/scrobblinglove.cpp)
+    set(CANTATA_UIS ${CANTATA_UIS} scrobbling/scrobblingsettings.ui)
+endif()

 set(CANTATA_LIBS ${CANTATA_LIBS} support)

--- a/21
+++ b/21
@@ -1,15 +1,16 @@
 2.4.3
 -----
-1. Update translations.
-2. Limit number of album tracks shown in context view to 500, thanks to
-   ccoors.
-3. Fix Community Radio Browser search.
-4. Remove dirble from radio section, as its no longer active.
-5. Better handling of CUE tracks when MPD is set to list as directory.
-6. Disable CUE parsing in cantata by default, as MPD handles this better now.
-7. Remember, and restore, main window position.
-8. Disable categorized view, as its been reported to crash (#1530)
-9. Remove stream providers, as many broken.
+ 1. Update translations.
+ 2. Limit number of album tracks shown in context view to 500, thanks to
+    ccoors.
+ 3. Fix Community Radio Browser search.
+ 4. Remove dirble from radio section, as its no longer active.
+ 5. Better handling of CUE tracks when MPD is set to list as directory.
+ 6. Disable CUE parsing in cantata by default, as MPD handles this better now.
+ 7. Remember, and restore, main window position.
+ 8. Disable categorized view, as its been reported to crash (#1530)
+ 9. Remove stream providers, as many broken.
+10. Disable scrollbing support, as auth changed.

 2.4.2
 -----
--- a/5
+++ b/5
@@ -26,7 +26,7 @@ The following options may be passed to CMake:
        they will contain extra debugging information.

    -ENABLE_CATEGORIZED_VIEW=ON
-        Enable categorized view. Can be disabled due to reported crash - #1530
+        Enable categorized view. Disabled due to reported crash - #1530
        Default: OFF

    -DENABLE_HTTP_STREAM_PLAYBACK=ON
@@ -49,6 +49,9 @@ The following options may be passed to CMake:
        system proxy settings are used.
        Default: ON

+    -DENABLE_SCROBBLING=ON
+        Enable scrobbling. Disabled due to auth failures - #1661
+        Default: OFF

    Linux specific:

--- a/gui/application.cpp
+++ b/gui/application.cpp
@@ -33,7 +33,9 @@
 #include "mpd-interface/mpdstatus.h"
 #include "support/thread.h"
 #include "tags/taghelperiface.h"
+#ifdef ENABLE_SCROBBLING
 #include "scrobbling/scrobbler.h"
+#endif
 #include "support/fancytabwidget.h"
 #include "support/combobox.h"
 #include "widgets/itemview.h"
@@ -80,7 +82,9 @@ void Application::init()
    TagHelperIface::self();
    #endif
    NetworkProxyFactory::self();
+    #ifdef ENABLE_SCROBBLING
    Scrobbler::self();
+    #endif
    MpdLibraryModel::self();
    PlaylistsModel::self();
    StreamsModel::self();
--- a/gui/cachesettings.cpp
+++ b/gui/cachesettings.cpp
@@ -37,7 +37,9 @@
 #include "models/streamsmodel.h"
 #include "online/podcastsearchdialog.h"
 #include "support/squeezedtextlabel.h"
+#ifdef ENABLE_SCROBBLING
 #include "scrobbling/scrobbler.h"
+#endif
 #include <QLabel>
 #include <QPushButton>
 #include <QStyle>
@@ -273,7 +275,9 @@ CacheSettings::CacheSettings(QWidget *parent)
    new CacheItem(tr("Stream Listings"), Utils::cacheDir(StreamsModel::constSubDir, false), QStringList() << "*"+StreamsModel::constCacheExt, tree);
    new CacheItem(tr("Podcast Directories"), Utils::cacheDir(PodcastSearchDialog::constCacheDir, false), QStringList() << "*"+PodcastSearchDialog::constExt, tree);
    new CacheItem(tr("Wikipedia Languages"), Utils::cacheDir(WikipediaSettings::constSubDir, false), QStringList() << "*.xml.gz", tree);
+    #ifdef ENABLE_SCROBBLING
    new CacheItem(tr("Scrobble Tracks"), Utils::cacheDir(Scrobbler::constCacheDir, false), QStringList() << "*.xml.gz", tree);
+    #endif

    for (int i=0; i<tree->topLevelItemCount(); ++i) {
        connect(static_cast<CacheItem *>(tree->topLevelItem(i)), SIGNAL(updated()), this, SLOT(updateSpace()));
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -56,7 +56,9 @@
 #include "context/ultimatelyricsprovider.h"
 #include "tags/taghelperiface.h"
 #include "context/contextwidget.h"
+#ifdef ENABLE_SCROBBLING
 #include "scrobbling/scrobbler.h"
+#endif
 #include "gui/mediakeys.h"
 #ifdef ENABLE_HTTP_STREAM_PLAYBACK
 #include "mpd-interface/httpstream.h"
@@ -150,7 +152,9 @@ static QString debugAreas()
            +QObject::tr("song-dialog - Song dialogs (tags, replaygain, organiser)")+QLatin1Char('\n')
            +QObject::tr("network-access - Network access")+QLatin1Char('\n')
            +QObject::tr("threads - Threads")+QLatin1Char('\n')
+            #ifdef ENABLE_SCROBBLING
            +QObject::tr("scrobbler - Scrobbling")+QLatin1Char('\n')
+            #endif
            +QObject::tr("sql - SQL access")+QLatin1Char('\n')
            +QObject::tr("media-keys - Media-keys")+QLatin1Char('\n')
            +QObject::tr("custom-actions - Custom actions")+QLatin1Char('\n')
@@ -224,9 +228,11 @@ static void installDebugMessageHandler(const QString &cmdLine)
        if (all || QLatin1String("threads")==area) {
            ThreadCleaner::enableDebug();
        }
+        #ifdef ENABLE_SCROBBLING
        if (all || QLatin1String("scrobbler")==area) {
            Scrobbler::enableDebug();
        }
+        #endif
        if (all || QLatin1String("sql")==area) {
            LibraryDb::enableDebug();
        }
--- a/gui/preferencesdialog.cpp
+++ b/gui/preferencesdialog.cpp
@@ -39,7 +39,9 @@
 #include "devices/audiocdsettings.h"
 #endif
 #include "shortcutssettingspage.h"
+#ifdef ENABLE_SCROBBLING
 #include "scrobbling/scrobblingsettings.h"
+#endif
 #include "apikeyssettings.h"
 #include "support/monoicon.h"
 #include <QDesktopWidget>
@@ -61,21 +63,27 @@ PreferencesDialog::PreferencesDialog(QWidget *parent)
    interface = new InterfaceSettings(this);
    context = new ContextSettings(this);
    cache = new CacheSettings(this);
+    #ifdef ENABLE_SCROBBLING
    scrobbling = new ScrobblingSettings(this);
+    #endif
    custom = new CustomActionsSettings(this);
    apiKeys = new ApiKeysSettings(this);
    server->load();
    playback->load();
    interface->load();
    context->load();
+    #ifdef ENABLE_SCROBBLING
    scrobbling->load();
+    #endif
    custom->load();
    QColor iconColor = Utils::clampColor(palette().text().color());
    addPage(QLatin1String("collection"), server, tr("Collection"), MonoIcon::icon(FontAwesome::music, iconColor), tr("Collection Settings"));
    addPage(QLatin1String("playback"), playback, tr("Playback"), MonoIcon::icon(FontAwesome::volumeup, iconColor), tr("Playback Settings"));
    addPage(QLatin1String("interface"), interface, tr("Interface"), MonoIcon::icon(FontAwesome::sliders, iconColor), tr("Interface Settings"));
    addPage(QLatin1String("info"), context, tr("Info"), MonoIcon::icon(FontAwesome::infocircle, iconColor), tr("Info View Settings"));
+    #ifdef ENABLE_SCROBBLING
    addPage(QLatin1String("scrobbling"), scrobbling, tr("Scrobbling"), MonoIcon::icon(FontAwesome::lastfm, iconColor), tr("Scrobbling Settings"));
+    #endif
    #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
    audiocd = new AudioCdSettings(0);
    audiocd->load();
@@ -136,7 +144,9 @@ void PreferencesDialog::writeSettings()
    audiocd->save();
    #endif
    context->save();
+    #ifdef ENABLE_SCROBBLING
    scrobbling->save();
+    #endif
    custom->save();
    apiKeys->save();
    Settings::self()->save();
--- a/gui/preferencesdialog.h
+++ b/gui/preferencesdialog.h
@@ -42,7 +42,9 @@ class QStringList;
 #ifdef ENABLE_PROXY_CONFIG
 class ProxySettings;
 #endif
+#ifdef ENABLE_SCROBBLING
 class ScrobblingSettings;
+#endif
 class CustomActionsSettings;
 class ApiKeysSettings;

@@ -82,7 +84,9 @@ private:
    #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND
    AudioCdSettings *audiocd;
    #endif
+    #ifdef ENABLE_SCROBBLING
    ScrobblingSettings *scrobbling;
+    #endif
    CustomActionsSettings *custom;
    ApiKeysSettings *apiKeys;
 };
--- a/widgets/nowplayingwidget.cpp
+++ b/widgets/nowplayingwidget.cpp
@@ -31,7 +31,9 @@
 #include "mpd-interface/mpdconnection.h"
 #include "models/playqueuemodel.h"
 #include "support/utils.h"
+#ifdef ENABLE_SCROBBLING
 #include "scrobbling/scrobblinglove.h"
+#endif
 #ifdef Q_OS_MAC
 #include "support/osxstyle.h"
 #endif
@@ -265,11 +267,13 @@ NowPlayingWidget::NowPlayingWidget(QWidget *p)
    time=new TimeLabel(this, slider);
    ratingWidget=new RatingWidget(this);
    infoLabel=new QLabel(this);
+    #ifdef ENABLE_SCROBBLING
    ScrobblingLove *love = new ScrobblingLove(this);
    ratingWidget->ensurePolished();
    int loveSize = ratingWidget->height()+Utils::scaleForDpi(4);
    love->setIconSize(QSize(ratingWidget->height(), ratingWidget->height()));
    love->setFixedSize(loveSize, loveSize);
+    #endif
    QFont f=track->font();
    QFont small=Utils::smallFont(f);
    f.setBold(true);
@@ -297,7 +301,9 @@ NowPlayingWidget::NowPlayingWidget(QWidget *p)
    topLayout->addWidget(track);
    topLayout->addWidget(infoLabel);
    topLayout->addWidget(ratingWidget);
+    #ifdef ENABLE_SCROBBLING
    topLayout->addWidget(love);
+    #endif
    layout->addLayout(topLayout);
    botLayout->addWidget(artist);
    botLayout->addWidget(time);