Merge pull request #4712 from Chocobozzz/skyfm

Change sky.fm to radiotunes.com
clementine-player · Jan 15, 2015 · c96502e · c96502e
2 parents 7f52793 + 5e5738f
commit c96502e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/data/data.qrc b/data/data.qrc
@@ -334,7 +334,6 @@
         <file>providers/radiogfm.png</file>
         <file>providers/rockradio.png</file>
         <file>providers/skydrive.png</file>
-        <file>providers/skyfm.png</file>
         <file>providers/somafm.png</file>
         <file>providers/songkick.png</file>
         <file>providers/soundcloud.png</file>
@@ -426,5 +425,6 @@
         <file>vk/link.png</file>
         <file>providers/seafile.png</file>
         <file>icons/32x32/internet-services.png</file>
+        <file>providers/radiotunes.png</file>
     </qresource>
 </RCC>
diff --git a/data/providers/radiotunes.png b/data/providers/radiotunes.png
diff --git a/data/providers/skyfm.png b/data/providers/skyfm.png
diff --git a/src/globalsearch/digitallyimportedsearchprovider.cpp b/src/globalsearch/digitallyimportedsearchprovider.cpp
@@ -24,8 +24,7 @@ DigitallyImportedSearchProvider::DigitallyImportedSearchProvider(
   Init(service_->name(), service->api_service_name(), service_->icon(),
        ArtIsInSongMetadata | CanGiveSuggestions | CanShowConfig);
 
-  set_safe_words(QStringList() << "sky.fm"
-                               << "skyfm"
+  set_safe_words(QStringList() << "radiotunes"
                                << "di.fm"
                                << "difm"
                                << "digitallyimported");

diff --git a/src/internet/core/internetmodel.cpp b/src/internet/core/internetmodel.cpp
@@ -94,7 +94,7 @@ InternetModel::InternetModel(Application* app, QObject* parent)
   AddService(new RadioGFMService(app, this));
   AddService(new RockRadioService(app, this));
   AddService(new SavedRadio(app, this));
-  AddService(new SkyFmService(app, this));
+  AddService(new RadioTunesService(app, this));
   AddService(new SomaFMService(app, this));
   AddService(new SoundCloudService(app, this));
   AddService(new SpotifyService(app, this));
@@ -371,7 +371,7 @@ int InternetModel::FindItemPosition(const QString& text) {
   int a = 0;
   int b = invisibleRootItem()->rowCount() - 1;
   while (a <= b) {
-    int mid = a + (b - a)/2;
+    int mid = a + (b - a) / 2;
     if (invisibleRootItem()->child(mid, 0)->text() < text) {
       a = mid + 1;
     } else {

diff --git a/src/internet/digitally/digitallyimportedclient.cpp b/src/internet/digitally/digitallyimportedclient.cpp
@@ -28,7 +28,7 @@
 #include "core/network.h"
 
 // The API used here is undocumented - it was reverse engineered by watching
-// calls made by the sky.fm android app:
+// calls made by the sky.fm (now RadioTunes) android app:
 // https://market.android.com/details?id=com.audioaddict.sky
 
 const char* DigitallyImportedClient::kApiUsername = "ephemeron";

diff --git a/src/internet/digitally/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp
@@ -244,11 +244,12 @@ DigitallyImportedService::DigitallyImportedService(Application* app,
                                    QIcon(":/providers/digitallyimported.png"),
                                    "di", app, model, true, parent) {}
 
-SkyFmService::SkyFmService(Application* app, InternetModel* model,
-                           QObject* parent)
-    : DigitallyImportedServiceBase(
-          "SKY.fm", "SKY.fm", QUrl("http://www.sky.fm"),
-          QIcon(":/providers/skyfm.png"), "sky", app, model, true, parent) {}
+RadioTunesService::RadioTunesService(Application* app, InternetModel* model,
+                                     QObject* parent)
+    : DigitallyImportedServiceBase("RadioTunes", "RadioTunes.com",
+                                   QUrl("http://www.radiotunes.com/"),
+                                   QIcon(":/providers/radiotunes.png"),
+                                   "radiotunes", app, model, true, parent) {}
 
 JazzRadioService::JazzRadioService(Application* app, InternetModel* model,
                                    QObject* parent)

diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h
@@ -67,7 +67,7 @@ class DigitallyImportedServiceBase : public InternetService {
  public slots:
   void ShowSettingsDialog();
 
- signals:
+signals:
   void StreamsChanged();
 
  private slots:
@@ -117,10 +117,10 @@ class DigitallyImportedService : public DigitallyImportedServiceBase {
                            QObject* parent = nullptr);
 };
 
-class SkyFmService : public DigitallyImportedServiceBase {
+class RadioTunesService : public DigitallyImportedServiceBase {
  public:
-  SkyFmService(Application* app, InternetModel* model,
-               QObject* parent = nullptr);
+  RadioTunesService(Application* app, InternetModel* model,
+                    QObject* parent = nullptr);
 };
 
 class JazzRadioService : public DigitallyImportedServiceBase {

diff --git a/src/internet/digitally/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp
@@ -38,8 +38,8 @@ QString DigitallyImportedUrlHandler::scheme() const {
 QIcon DigitallyImportedUrlHandler::icon() const {
   if (scheme() == "di") {
     return QIcon(":providers/digitallyimported.png");
-  } else if (scheme() == "sky") {
-    return QIcon(":providers/skyfm.png");
+  } else if (scheme() == "radiotunes") {
+    return QIcon(":providers/radiotunes.png");
   } else if (scheme() == "jazzradio") {
     return QIcon(":providers/jazzradio.png");
   } else if (scheme() == "rockradio") {