From 3960c7d8e6c8820a4dc9537cfd851a15e2ea4b05 Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 11 Jul 2021 05:18:56 +0200 Subject: [PATCH] Add SomaFM and Radio Paradise to scrobbler sources --- src/scrobbler/audioscrobbler.cpp | 4 +- src/settings/scrobblersettingspage.cpp | 4 ++ src/settings/scrobblersettingspage.ui | 81 +++++++++++++++----------- 3 files changed, 53 insertions(+), 36 deletions(-) diff --git a/src/scrobbler/audioscrobbler.cpp b/src/scrobbler/audioscrobbler.cpp index 7071e78c3..f99cf1c30 100644 --- a/src/scrobbler/audioscrobbler.cpp +++ b/src/scrobbler/audioscrobbler.cpp @@ -94,7 +94,9 @@ void AudioScrobbler::ReloadSettings() { << Song::Source_Stream << Song::Source_Tidal << Song::Source_Subsonic - << Song::Source_Qobuz; + << Song::Source_Qobuz + << Song::Source_SomaFM + << Song::Source_RadioParadise; } else { for (const QString &source : sources) { diff --git a/src/settings/scrobblersettingspage.cpp b/src/settings/scrobblersettingspage.cpp index 06879c21c..9824c0c83 100644 --- a/src/settings/scrobblersettingspage.cpp +++ b/src/settings/scrobblersettingspage.cpp @@ -108,6 +108,8 @@ void ScrobblerSettingsPage::Load() { ui_->checkbox_source_tidal->setChecked(scrobbler_->sources().contains(Song::Source_Tidal)); ui_->checkbox_source_qobuz->setChecked(scrobbler_->sources().contains(Song::Source_Qobuz)); ui_->checkbox_source_stream->setChecked(scrobbler_->sources().contains(Song::Source_Stream)); + ui_->checkbox_source_somafm->setChecked(scrobbler_->sources().contains(Song::Source_SomaFM)); + ui_->checkbox_source_radioparadise->setChecked(scrobbler_->sources().contains(Song::Source_RadioParadise)); ui_->checkbox_source_unknown->setChecked(scrobbler_->sources().contains(Song::Source_Unknown)); ui_->checkbox_lastfm_enable->setChecked(lastfmscrobbler_->IsEnabled()); @@ -149,6 +151,8 @@ void ScrobblerSettingsPage::Save() { if (ui_->checkbox_source_tidal->isChecked()) sources << Song::TextForSource(Song::Source_Tidal); if (ui_->checkbox_source_qobuz->isChecked()) sources << Song::TextForSource(Song::Source_Qobuz); if (ui_->checkbox_source_stream->isChecked()) sources << Song::TextForSource(Song::Source_Stream); + if (ui_->checkbox_source_somafm->isChecked()) sources << Song::TextForSource(Song::Source_SomaFM); + if (ui_->checkbox_source_radioparadise->isChecked()) sources << Song::TextForSource(Song::Source_RadioParadise); if (ui_->checkbox_source_unknown->isChecked()) sources << Song::TextForSource(Song::Source_Unknown); s.setValue("sources", sources); diff --git a/src/settings/scrobblersettingspage.ui b/src/settings/scrobblersettingspage.ui index 56c332b36..21f066ecf 100644 --- a/src/settings/scrobblersettingspage.ui +++ b/src/settings/scrobblersettingspage.ui @@ -7,7 +7,7 @@ 0 0 460 - 1009 + 1075 @@ -135,34 +135,6 @@ - - - - Local file - - - - - - - Device - - - - - - - CDDA - - - - - - - Stream - - - @@ -170,21 +142,63 @@ - + + + + Local file + + + + Tidal - + + + + Device + + + + Qobuz - + + + + CDDA + + + + + + + SomaFM + + + + + + + Stream + + + + + + + Radio Paradise + + + + Unknown @@ -412,12 +426,9 @@ checkbox_source_collection checkbox_source_local checkbox_source_device - checkbox_source_cdda - checkbox_source_stream checkbox_source_subsonic checkbox_source_tidal checkbox_source_qobuz - checkbox_source_unknown checkbox_lastfm_enable checkbox_lastfm_https button_lastfm_login