From fa7bcff43d9b00874f69d0000ef8558ce8978f45 Mon Sep 17 00:00:00 2001
From: Hugues Morisset <morisset.hugues@gmail.com>
Date: Tue, 4 Oct 2016 00:29:17 +0200
Subject: [PATCH 1/7] Fix undefined symbol error conversion from std::string to
 TagLib::String Taglib version 1.9.1-2.4 on debian

---
 ext/libclementine-tagreader/tagreader.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/libclementine-tagreader/tagreader.cpp b/ext/libclementine-tagreader/tagreader.cpp
index a199ac565..8969dde36 100644
--- a/ext/libclementine-tagreader/tagreader.cpp
+++ b/ext/libclementine-tagreader/tagreader.cpp
@@ -709,9 +709,9 @@ bool TagReader::SaveFile(const QString& filename,
         TagLib::MP4::Item(song.disc() <= 0 - 1 ? 0 : song.disc(), 0);
     tag->itemListMap()["tmpo"] = TagLib::StringList(
         song.bpm() <= 0 - 1 ? "0" : TagLib::String::number(song.bpm()));
-    tag->itemListMap()["\251wrt"] = TagLib::StringList(song.composer());
-    tag->itemListMap()["\251grp"] = TagLib::StringList(song.grouping());
-    tag->itemListMap()["aART"] = TagLib::StringList(song.albumartist());
+    tag->itemListMap()["\251wrt"] = TagLib::StringList(song.composer().c_str());
+    tag->itemListMap()["\251grp"] = TagLib::StringList(song.grouping().c_str());
+    tag->itemListMap()["aART"] = TagLib::StringList(song.albumartist().c_str());
     tag->itemListMap()["cpil"] =
         TagLib::StringList(song.compilation() ? "1" : "0");
   }

From 1a2f6e2fe8ff054f1125183d3b00b468d9f5fb5a Mon Sep 17 00:00:00 2001
From: Clementine Buildbot <buildbot@clementine-player.org>
Date: Thu, 13 Oct 2016 15:18:59 +0000
Subject: [PATCH 2/7] Automatic merge of translations from Transifex
 (https://www.transifex.com/projects/p/clementine/resource/clementineplayer)

---
 src/translations/hr.po | 84 +++++++++++++++++++++---------------------
 src/translations/id.po | 12 +++---
 src/translations/ms.po |  6 +--
 src/translations/sv.po |  6 +--
 4 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/translations/hr.po b/src/translations/hr.po
index 21daf1161..6438a0a2f 100644
--- a/src/translations/hr.po
+++ b/src/translations/hr.po
@@ -11,8 +11,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
-"PO-Revision-Date: 2016-09-18 12:46+0000\n"
-"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n"
+"PO-Revision-Date: 2016-10-03 19:09+0000\n"
+"Last-Translator: gogo <trebelnik2@gmail.com>\n"
 "Language-Team: Croatian (http://www.transifex.com/davidsansome/clementine/language/hr/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -194,7 +194,7 @@ msgstr "Dodaci"
 
 #: ../bin/src/ui_edittagdialog.h:728
 msgid "&Grouping"
-msgstr ""
+msgstr "&Grupiranje"
 
 #: ../bin/src/ui_mainwindow.h:734
 msgid "&Help"
@@ -219,7 +219,7 @@ msgstr "&Zaključaj ocjenu"
 
 #: ../bin/src/ui_edittagdialog.h:731
 msgid "&Lyrics"
-msgstr ""
+msgstr "&Tekst pjesame"
 
 #: ../bin/src/ui_mainwindow.h:732
 msgid "&Music"
@@ -259,7 +259,7 @@ msgstr "Alati"
 
 #: ../bin/src/ui_edittagdialog.h:724
 msgid "&Year"
-msgstr ""
+msgstr "&Godina"
 
 #: ui/edittagdialog.cpp:50
 msgid "(different across multiple songs)"
@@ -362,7 +362,7 @@ msgid ""
 "href=\"%1\">%2</a>, which is released under the <a href=\"https"
 "://clementine-player.org/licenses/by-sa/3.0/legalcode.txt\">Creative Commons"
 " Attribution-Share-Alike License 3.0</a>.</p>"
-msgstr ""
+msgstr "<p>Ovaj članak koristi materijal s Wikipedia članka <a href=\"%1\">%2</a>, koji je objavljen pod <a href=\"https://clementine-player.org/licenses/by-sa/3.0/legalcode.txt\">Creative Commons Attribution-Share-Alike Licencom 3.0</a>.</p>"
 
 #: ../bin/src/ui_organisedialog.h:250
 msgid ""
@@ -788,7 +788,7 @@ msgstr "Dopusti mid/side enkôdiranje"
 
 #: ../bin/src/ui_transcodedialog.h:230
 msgid "Alongside the originals"
-msgstr "Pokraj orginala"
+msgstr "Pokraj izvornika"
 
 #: ../bin/src/ui_behavioursettingspage.h:324
 msgid "Always hide the main window"
@@ -857,7 +857,7 @@ msgstr "Primjenite kompresiju da spriječite isječak"
 #: ui/equalizer.cpp:222
 #, qt-format
 msgid "Are you sure you want to delete the \"%1\" preset?"
-msgstr "Sigurno želite izbrisati \"%1\" postavke?"
+msgstr "Sigurno želite obrisati \"%1\" postavke?"
 
 #: ui/edittagdialog.cpp:803
 msgid "Are you sure you want to reset this song's statistics?"
@@ -927,7 +927,7 @@ msgstr "Automatske"
 
 #: ../bin/src/ui_librarysettingspage.h:189
 msgid "Automatic updating"
-msgstr "Automatsko ažuriranje"
+msgstr "Automatska nadopuna"
 
 #: ../bin/src/ui_librarysettingspage.h:207
 msgid "Automatically open single categories in the library tree"
@@ -1004,7 +1004,7 @@ msgstr "Najbolje"
 
 #: songinfo/artistbiography.cpp:90 songinfo/artistbiography.cpp:255
 msgid "Biography"
-msgstr ""
+msgstr "Životopis"
 
 #: playlist/playlist.cpp:1355 ../bin/src/ui_edittagdialog.h:706
 msgid "Bit rate"
@@ -1154,7 +1154,7 @@ msgstr "Provjeri za nove nastavke"
 
 #: internet/googledrive/googledriveservice.cpp:221
 msgid "Check for updates"
-msgstr "Provjeri ažuriranja"
+msgstr "Provjeri nadopune"
 
 #: ui/mainwindow.cpp:805
 msgid "Check for updates..."
@@ -1343,7 +1343,7 @@ msgstr "Klub"
 
 #: ../bin/src/ui_edittagdialog.h:726
 msgid "Co&mposer"
-msgstr ""
+msgstr "Sk&ladatelj"
 
 #: ../bin/src/ui_appearancesettingspage.h:271
 msgid "Colors"
@@ -1570,7 +1570,7 @@ msgstr "Omoti s %1"
 
 #: core/commandlineoptions.cpp:172
 msgid "Create a new playlist with files/URLs"
-msgstr ""
+msgstr "Stvori novi popis izvođenja s datotekama/URL-ovima"
 
 #: ../bin/src/ui_playbacksettingspage.h:344
 msgid "Cross-fade when changing tracks automatically"
@@ -1671,7 +1671,7 @@ msgstr "Pauza između vizualizacija"
 #: playlist/playlistlistcontainer.cpp:70
 #: ../bin/src/ui_playlistlistcontainer.h:130
 msgid "Delete"
-msgstr "Izbriši"
+msgstr "Obriši"
 
 #: internet/podcasts/podcastservice.cpp:435
 msgid "Delete downloaded data"
@@ -1680,16 +1680,16 @@ msgstr "Obriši preuzete podatke"
 #: devices/deviceview.cpp:408 library/libraryview.cpp:645
 #: ui/mainwindow.cpp:2342 widgets/fileview.cpp:188
 msgid "Delete files"
-msgstr "Izbrišite datoteku"
+msgstr "Obrišite datoteku"
 
 #: devices/deviceview.cpp:232
 msgid "Delete from device..."
-msgstr "Izbrišite s uređaja..."
+msgstr "Obrišite s uređaja..."
 
 #: library/libraryview.cpp:411 ui/mainwindow.cpp:707
 #: widgets/fileviewlist.cpp:47
 msgid "Delete from disk..."
-msgstr "Izbrišite s diska..."
+msgstr "Obrišite s diska..."
 
 #: ../bin/src/ui_podcastsettingspage.h:268
 msgid "Delete played episodes"
@@ -1697,15 +1697,15 @@ msgstr "Obriši reproducirane nastavke"
 
 #: ui/equalizer.cpp:221 ../bin/src/ui_equalizer.h:168
 msgid "Delete preset"
-msgstr "Izbrišite predložak"
+msgstr "Obrišite predložak"
 
 #: library/libraryview.cpp:401
 msgid "Delete smart playlist"
-msgstr "Izbrišite pametni popis izvođenja"
+msgstr "Obrišite pametni popis izvođenja"
 
 #: ../bin/src/ui_organisedialog.h:245
 msgid "Delete the original files"
-msgstr "Izbriši orginalne datoteke"
+msgstr "Obriši izvorne datoteke"
 
 #: core/deletefiles.cpp:50
 msgid "Deleting files"
@@ -2494,7 +2494,7 @@ msgstr "Pun Treble"
 
 #: ../bin/src/ui_edittagdialog.h:729
 msgid "Ge&nre"
-msgstr ""
+msgstr "Vrsta &glazbe"
 
 #: ui/settingsdialog.cpp:137
 msgid "General"
@@ -2573,7 +2573,7 @@ msgstr "Grupiraj po Albumu"
 
 #: library/libraryfilterwidget.cpp:150
 msgid "Group by Album artist/Album"
-msgstr ""
+msgstr "Grupiraj po Izvođaču albuma/Albumu"
 
 #: library/libraryfilterwidget.cpp:143
 msgid "Group by Artist"
@@ -2884,7 +2884,7 @@ msgstr "Nastavi izvođenje u pozadini kada je prozor zatvoren"
 
 #: ../bin/src/ui_organisedialog.h:244
 msgid "Keep the original files"
-msgstr "Zadrži orginalne datoteke"
+msgstr "Zadrži izvorne datoteke"
 
 #: ../bin/src/ui_mainwindow.h:697
 msgctxt "Label for buton to enable/disable kittens in the now playing widget"
@@ -3128,7 +3128,7 @@ msgstr "Tekstovi pjesama sa %1"
 
 #: songinfo/taglyricsinfoprovider.cpp:29
 msgid "Lyrics from the tag"
-msgstr ""
+msgstr "Tekst pjesme sa oznake"
 
 #: transcoder/transcoder.cpp:235
 msgid "M4A AAC"
@@ -3632,7 +3632,7 @@ msgstr "Se otvoriti u novom popisu izvođenja"
 
 #: songinfo/artistbiography.cpp:94 songinfo/artistbiography.cpp:261
 msgid "Open in your browser"
-msgstr ""
+msgstr "Otvori u svojem pregledniku"
 
 #: ../bin/src/ui_globalshortcutssettingspage.h:168
 #: ../bin/src/ui_globalshortcutssettingspage.h:170
@@ -3675,7 +3675,7 @@ msgstr "Organiziranje datoteka"
 
 #: ui/trackselectiondialog.cpp:163
 msgid "Original tags"
-msgstr "Orginalne oznake"
+msgstr "Izvorne oznake"
 
 #: library/savedgroupingmanager.cpp:101 playlist/playlist.cpp:1329
 #: ui/organisedialog.cpp:73 ../bin/src/ui_groupbydialog.h:135
@@ -3730,7 +3730,7 @@ msgstr "Raščlanjivanje Jamendo kataloga"
 
 #: devices/udisks2lister.cpp:79
 msgid "Partition label"
-msgstr ""
+msgstr "Naziv particije"
 
 #: ui/equalizer.cpp:139
 msgid "Party"
@@ -4359,7 +4359,7 @@ msgstr "Scrobblaj pjesmu koju slušam"
 
 #: ../bin/src/ui_behavioursettingspage.h:313
 msgid "Scroll over icon to change track"
-msgstr ""
+msgstr "Prijeđi preko ikone za promjenu pjesme"
 
 #: ../bin/src/ui_seafilesettingspage.h:164
 msgid "Seafile"
@@ -4641,7 +4641,7 @@ msgstr "Prikaži samo neoznačene pjesme"
 
 #: ../bin/src/ui_mainwindow.h:729
 msgid "Show or hide the sidebar"
-msgstr ""
+msgstr "Prikaži ili sakrij bočnu traku"
 
 #: ../bin/src/ui_vksettingspage.h:220
 msgid "Show playing song on your page"
@@ -4653,7 +4653,7 @@ msgstr "Prikaži prijedloge pretraživanja"
 
 #: ../bin/src/ui_mainwindow.h:727
 msgid "Show sidebar"
-msgstr ""
+msgstr "Prikaži bočnu traku"
 
 #: ../bin/src/ui_lastfmsettingspage.h:136
 msgid "Show the \"love\" button"
@@ -5054,7 +5054,7 @@ msgstr "Probno razdoblje za Subsonic poslužitelj je završeno. Molim, donirajte
 msgid ""
 "The version of Clementine you've just updated to requires a full library "
 "rescan because of the new features listed below:"
-msgstr "Inačica Clementinea koju ste upravo ažurirali zahtjeva ponovnu pretragu cijele fonoteke zbog novih mogućnosti navedenih ispod:"
+msgstr "Inačica Clementinea koju ste upravo nadopunili zahtijeva ponovnu pretragu cijele fonoteke zbog novih mogućnosti navedenih ispod:"
 
 #: library/libraryview.cpp:562
 msgid "There are other songs in this album"
@@ -5237,7 +5237,7 @@ msgstr "Ukupno mrežnih zahtjeva"
 
 #: ../bin/src/ui_edittagdialog.h:720
 msgid "Trac&k"
-msgstr ""
+msgstr "Broj &pjesme"
 
 #: playlist/playlist.cpp:1323 ui/organisedialog.cpp:69
 #: ../bin/src/ui_trackselectiondialog.h:212 ../bin/src/ui_ripcddialog.h:304
@@ -5291,7 +5291,7 @@ msgstr "URL(ovi)"
 
 #: devices/udisks2lister.cpp:80
 msgid "UUID"
-msgstr ""
+msgstr "UUID"
 
 #: ../bin/src/ui_transcoderoptionsspeex.h:227
 msgid "Ultra wide band (UWB)"
@@ -5348,41 +5348,41 @@ msgstr "Nadolazeći koncerti"
 
 #: internet/vk/vkservice.cpp:347
 msgid "Update"
-msgstr "Ažuriranje"
+msgstr "Nadopuna"
 
 #: internet/podcasts/podcastservice.cpp:420
 msgid "Update all podcasts"
-msgstr "Ažuriraj sve podcaste"
+msgstr "Nadopuni sve podcaste"
 
 #: ../bin/src/ui_mainwindow.h:711
 msgid "Update changed library folders"
-msgstr "Ažurirajte promjene u mapi fonoteke"
+msgstr "Nadopuni promjene u mapi fonoteke"
 
 #: ../bin/src/ui_librarysettingspage.h:190
 msgid "Update the library when Clementine starts"
-msgstr "Ažuriraj fonoteku kada se Clementine pokrene"
+msgstr "Nadopuni fonoteku kada se Clementine pokrene"
 
 #: internet/podcasts/podcastservice.cpp:429
 msgid "Update this podcast"
-msgstr "Ažuriraj ovaj podcast"
+msgstr "Nadopuni ovaj podcast"
 
 #: ../bin/src/ui_podcastsettingspage.h:251
 msgid "Updating"
-msgstr "Ažuriranje"
+msgstr "Nadopuna"
 
 #: library/librarywatcher.cpp:97
 #, qt-format
 msgid "Updating %1"
-msgstr "Ažuriranje %1"
+msgstr "Nadopuna %1"
 
 #: devices/deviceview.cpp:105
 #, qt-format
 msgid "Updating %1%..."
-msgstr "Ažuriranje %1..."
+msgstr "Nadopuna %1%..."
 
 #: library/librarywatcher.cpp:95
 msgid "Updating library"
-msgstr "Ažuriranje fonoteke"
+msgstr "Nadopuna fonoteke"
 
 #: core/commandlineoptions.cpp:152
 msgid "Usage"
diff --git a/src/translations/id.po b/src/translations/id.po
index 48cd77f37..4c605e400 100644
--- a/src/translations/id.po
+++ b/src/translations/id.po
@@ -28,8 +28,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
-"PO-Revision-Date: 2016-09-18 12:46+0000\n"
-"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n"
+"PO-Revision-Date: 2016-10-08 16:48+0000\n"
+"Last-Translator: zk\n"
 "Language-Team: Indonesian (http://www.transifex.com/davidsansome/clementine/language/id/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -2590,7 +2590,7 @@ msgstr "Grup berdasarkan Album"
 
 #: library/libraryfilterwidget.cpp:150
 msgid "Group by Album artist/Album"
-msgstr ""
+msgstr "Grup berdasarkan Artis album/Album"
 
 #: library/libraryfilterwidget.cpp:143
 msgid "Group by Artist"
@@ -3145,7 +3145,7 @@ msgstr "Lirik dari %1"
 
 #: songinfo/taglyricsinfoprovider.cpp:29
 msgid "Lyrics from the tag"
-msgstr ""
+msgstr "Lirik dari tag"
 
 #: transcoder/transcoder.cpp:235
 msgid "M4A AAC"
@@ -4658,7 +4658,7 @@ msgstr "Tampilkan hanya tidak bertag"
 
 #: ../bin/src/ui_mainwindow.h:729
 msgid "Show or hide the sidebar"
-msgstr ""
+msgstr "Tampil atau sembunyikan bilah sisi"
 
 #: ../bin/src/ui_vksettingspage.h:220
 msgid "Show playing song on your page"
@@ -4670,7 +4670,7 @@ msgstr "Tampilkan saran pencarian"
 
 #: ../bin/src/ui_mainwindow.h:727
 msgid "Show sidebar"
-msgstr ""
+msgstr "Tampilkan bilah sisi"
 
 #: ../bin/src/ui_lastfmsettingspage.h:136
 msgid "Show the \"love\" button"
diff --git a/src/translations/ms.po b/src/translations/ms.po
index 4b9897b71..375362584 100644
--- a/src/translations/ms.po
+++ b/src/translations/ms.po
@@ -9,8 +9,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
-"PO-Revision-Date: 2016-09-18 12:46+0000\n"
-"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n"
+"PO-Revision-Date: 2016-10-02 02:48+0000\n"
+"Last-Translator: abuyop <abuyop@gmail.com>\n"
 "Language-Team: Malay (http://www.transifex.com/davidsansome/clementine/language/ms/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3126,7 +3126,7 @@ msgstr "Lirik dari %1"
 
 #: songinfo/taglyricsinfoprovider.cpp:29
 msgid "Lyrics from the tag"
-msgstr ""
+msgstr "Lirik dari tag"
 
 #: transcoder/transcoder.cpp:235
 msgid "M4A AAC"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index e4447a414..ddcc92306 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -29,8 +29,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Clementine Music Player\n"
-"PO-Revision-Date: 2016-09-18 12:46+0000\n"
-"Last-Translator: Clementine Buildbot <clementinebuildbot@davidsansome.com>\n"
+"PO-Revision-Date: 2016-10-07 12:09+0000\n"
+"Last-Translator: Staffan Vilcans\n"
 "Language-Team: Swedish (http://www.transifex.com/davidsansome/clementine/language/sv/)\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -3146,7 +3146,7 @@ msgstr "Låttext från %1"
 
 #: songinfo/taglyricsinfoprovider.cpp:29
 msgid "Lyrics from the tag"
-msgstr ""
+msgstr "Låttext från etiketten"
 
 #: transcoder/transcoder.cpp:235
 msgid "M4A AAC"

From 650f06f7addc9466c95aa1e1ef196ae3e34fedc6 Mon Sep 17 00:00:00 2001
From: Nicolas Martinelli <nicolas.martinelli@gmail.com>
Date: Thu, 20 Oct 2016 21:36:04 +0200
Subject: [PATCH 3/7] Fix Subsonic endpoint

According to the documentation, the endpoint is `getAlbumList`, not
`GetAlbumList`. This typo makes the complete feature not working at
all.

Source: http://www.subsonic.org/pages/api.jsp#getAlbumList
---
 src/internet/subsonic/subsonicdynamicplaylist.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/internet/subsonic/subsonicdynamicplaylist.cpp b/src/internet/subsonic/subsonicdynamicplaylist.cpp
index e7c18a132..4d6cfa8c5 100644
--- a/src/internet/subsonic/subsonicdynamicplaylist.cpp
+++ b/src/internet/subsonic/subsonicdynamicplaylist.cpp
@@ -93,7 +93,7 @@ PlaylistItemList SubsonicDynamicPlaylist::GenerateMore(int count) {
   }
   BOOST_SCOPE_EXIT_END
 
-  QUrl url = service->BuildRequestUrl("GetAlbumList");
+  QUrl url = service->BuildRequestUrl("getAlbumList");
   QNetworkAccessManager network;
 
   if (count > kMaxCount) count = kMaxCount;

From 420601f10a12eec6d2c903add30490ce444328b5 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Mon, 7 Nov 2016 18:22:06 +0000
Subject: [PATCH 4/7] Add support for classicalradio.com

---
 src/internet/core/internetmodel.cpp           | 25 ++++++++++---------
 .../digitallyimportedservicebase.cpp          | 15 ++++++++---
 .../digitally/digitallyimportedservicebase.h  | 10 ++++++--
 3 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp
index d3c8d6eb8..65c4f88f4 100644
--- a/src/internet/core/internetmodel.cpp
+++ b/src/internet/core/internetmodel.cpp
@@ -28,22 +28,22 @@
 #include <QMimeData>
 #include <QtDebug>
 
-#include "internet/digitally/digitallyimportedservicebase.h"
-#include "internet/icecast/icecastservice.h"
-#include "internet/core/internetmimedata.h"
-#include "internet/core/internetservice.h"
-#include "internet/jamendo/jamendoservice.h"
-#include "internet/magnatune/magnatuneservice.h"
-#include "internet/internetradio/savedradio.h"
-#include "internet/somafm/somafmservice.h"
-#include "internet/intergalacticfm/intergalacticfmservice.h"
-#include "internet/soundcloud/soundcloudservice.h"
-#include "internet/spotify/spotifyservice.h"
-#include "internet/subsonic/subsonicservice.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/mergedproxymodel.h"
+#include "internet/core/internetmimedata.h"
+#include "internet/core/internetservice.h"
+#include "internet/digitally/digitallyimportedservicebase.h"
+#include "internet/icecast/icecastservice.h"
+#include "internet/intergalacticfm/intergalacticfmservice.h"
+#include "internet/internetradio/savedradio.h"
+#include "internet/jamendo/jamendoservice.h"
+#include "internet/magnatune/magnatuneservice.h"
 #include "internet/podcasts/podcastservice.h"
+#include "internet/somafm/somafmservice.h"
+#include "internet/soundcloud/soundcloudservice.h"
+#include "internet/spotify/spotifyservice.h"
+#include "internet/subsonic/subsonicservice.h"
 #include "smartplaylists/generatormimedata.h"
 
 #ifdef HAVE_GOOGLE_DRIVE
@@ -84,6 +84,7 @@ InternetModel::InternetModel(Application* app, QObject* parent)
 
   merged_model_->setSourceModel(this);
 
+  AddService(new ClassicalRadioService(app, this));
   AddService(new DigitallyImportedService(app, this));
   AddService(new IcecastService(app, this));
   AddService(new JamendoService(app, this));
diff --git a/src/internet/digitally/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp
index b2a2b50d9..538d30c72 100644
--- a/src/internet/digitally/digitallyimportedservicebase.cpp
+++ b/src/internet/digitally/digitallyimportedservicebase.cpp
@@ -25,17 +25,17 @@
 #include <QNetworkReply>
 #include <QSettings>
 
-#include "digitallyimportedclient.h"
-#include "digitallyimportedurlhandler.h"
-#include "internet/core/internetmodel.h"
 #include "core/application.h"
 #include "core/closure.h"
 #include "core/logging.h"
 #include "core/network.h"
 #include "core/player.h"
 #include "core/taskmanager.h"
+#include "digitallyimportedclient.h"
+#include "digitallyimportedurlhandler.h"
 #include "globalsearch/digitallyimportedsearchprovider.h"
 #include "globalsearch/globalsearch.h"
+#include "internet/core/internetmodel.h"
 #include "ui/iconloader.h"
 
 const char* DigitallyImportedServiceBase::kSettingsGroup = "digitally_imported";
@@ -260,3 +260,12 @@ RockRadioService::RockRadioService(Application* app, InternetModel* model,
           "RockRadio", "ROCKRADIO.com", QUrl("http://www.rockradio.com"),
           IconLoader::Load("rockradio", IconLoader::Provider), "rockradio", app,
           model, false, parent) {}
+
+ClassicalRadioService::ClassicalRadioService(Application* app,
+                                             InternetModel* model,
+                                             QObject* parent)
+    : DigitallyImportedServiceBase(
+          "ClassicalRadio", "ClassicalRadio.com",
+          QUrl("http://www.classicalradio.com"),
+          IconLoader::Load("digitallyimported", IconLoader::Provider),
+          "classicalradio", app, model, false, parent) {}
diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h
index 216c8ece4..9cd2d0f15 100644
--- a/src/internet/digitally/digitallyimportedservicebase.h
+++ b/src/internet/digitally/digitallyimportedservicebase.h
@@ -22,9 +22,9 @@
 
 #include <memory>
 
+#include "core/cachedlist.h"
 #include "digitallyimportedclient.h"
 #include "internet/core/internetservice.h"
-#include "core/cachedlist.h"
 
 class DigitallyImportedClient;
 class DigitallyImportedUrlHandler;
@@ -67,7 +67,7 @@ class DigitallyImportedServiceBase : public InternetService {
  public slots:
   void ShowSettingsDialog();
 
-signals:
+ signals:
   void StreamsChanged();
 
  private slots:
@@ -133,4 +133,10 @@ class RockRadioService : public DigitallyImportedServiceBase {
                    QObject* parent = nullptr);
 };
 
+class ClassicalRadioService : public DigitallyImportedServiceBase {
+ public:
+  ClassicalRadioService(Application* app, InternetModel* model,
+                        QObject* parent = nullptr);
+};
+
 #endif  // INTERNET_DIGITALLY_DIGITALLYIMPORTEDSERVICEBASE_H_

From d19ee714438b1cbc97463b0054d67d0ef44aebbc Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Wed, 9 Nov 2016 13:58:39 +0000
Subject: [PATCH 5/7] Try disabling SPMediaKeyTap on Sierra+.

Update issue #5497
---
 src/core/mac_startup.mm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/core/mac_startup.mm b/src/core/mac_startup.mm
index 3d7e3b350..cb3f4e214 100644
--- a/src/core/mac_startup.mm
+++ b/src/core/mac_startup.mm
@@ -27,6 +27,7 @@
 #import <Foundation/NSError.h>
 #import <Foundation/NSFileManager.h>
 #import <Foundation/NSPathUtilities.h>
+#import <Foundation/NSProcessInfo.h>
 #import <Foundation/NSThread.h>
 #import <Foundation/NSTimer.h>
 #import <Foundation/NSURL.h>
@@ -160,10 +161,16 @@ static BreakpadRef InitBreakpad() {
 
 - (void)applicationDidFinishLaunching:(NSNotification*)aNotification {
   key_tap_ = [[SPMediaKeyTap alloc] initWithDelegate:self];
-  if ([SPMediaKeyTap usesGlobalMediaKeyTap])
+  if ([SPMediaKeyTap usesGlobalMediaKeyTap] &&
+      ![[NSProcessInfo processInfo]
+          isOperatingSystemAtLeastVersion:(NSOperatingSystemVersion){
+                                              .majorVersion = 10,
+                                              .minorVersion = 12,
+                                              .patchVersion = 0}]) {
     [key_tap_ startWatchingMediaKeys];
-  else
+  } else {
     qLog(Warning) << "Media key monitoring disabled";
+  }
 }
 
 - (BOOL)application:(NSApplication*)app openFile:(NSString*)filename {

From 5e7dd00024328f7ce43946ae8e30ef362d409284 Mon Sep 17 00:00:00 2001
From: John Maguire <john.maguire@gmail.com>
Date: Mon, 14 Nov 2016 12:55:24 +0000
Subject: [PATCH 6/7] Use a flickr group instead of a tag for kittens.

Fixes #5531
---
 src/covers/kittenloader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/covers/kittenloader.cpp b/src/covers/kittenloader.cpp
index 008871385..ac6902309 100644
--- a/src/covers/kittenloader.cpp
+++ b/src/covers/kittenloader.cpp
@@ -31,7 +31,7 @@ const char* KittenLoader::kFlickrKittenUrl =
     "https://api.flickr.com/services/rest/"
     "?method=flickr.photos.search"
     "&api_key=808b52887b3cc7fe098abd62f6ed1745"
-    "&tags=kitten"
+    "&group_id=99442622@N00"
     "&sort=random"
     "&safe_search=1"
     "&content_type=1";

From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Thu, 8 Dec 2016 23:12:17 +0100
Subject: [PATCH 7/7] Add compatibility with chromaprint >= 1.4

---
 src/musicbrainz/chromaprinter.cpp | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp
index 9579b62ae..c7ad99e2e 100644
--- a/src/musicbrainz/chromaprinter.cpp
+++ b/src/musicbrainz/chromaprinter.cpp
@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() {
   ChromaprintContext* chromaprint =
       chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT);
   chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels);
-  chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()),
+  chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()),
                    data.size() / 2);
   chromaprint_finish(chromaprint);
 
-  void* fprint = nullptr;
   int size = 0;
+
+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4
+  u_int32_t *fprint = nullptr;
+  char *encoded = nullptr;
+#else
+  void *fprint = nullptr;
+  void *encoded = nullptr;
+#endif
+
   int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size);
+
   QByteArray fingerprint;
   if (ret == 1) {
-    void* encoded = nullptr;
     int encoded_size = 0;
     chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT,
                                    &encoded, &encoded_size, 1);