diff --git a/data/data.qrc b/data/data.qrc
index 838816aab..162c2f7ff 100644
--- a/data/data.qrc
+++ b/data/data.qrc
@@ -334,7 +334,6 @@
providers/radiogfm.png
providers/rockradio.png
providers/skydrive.png
- providers/skyfm.png
providers/somafm.png
providers/songkick.png
providers/soundcloud.png
@@ -426,5 +425,6 @@
vk/link.png
providers/seafile.png
icons/32x32/internet-services.png
+ providers/radiotunes.png
diff --git a/data/providers/radiotunes.png b/data/providers/radiotunes.png
new file mode 100644
index 000000000..e7e0bb83a
Binary files /dev/null and b/data/providers/radiotunes.png differ
diff --git a/data/providers/skyfm.png b/data/providers/skyfm.png
deleted file mode 100644
index e96adaa98..000000000
Binary files a/data/providers/skyfm.png and /dev/null differ
diff --git a/src/globalsearch/digitallyimportedsearchprovider.cpp b/src/globalsearch/digitallyimportedsearchprovider.cpp
index d59365f16..2abb20f59 100644
--- 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
index bbe108de2..4783466ee 100644
--- 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
index 642619687..9609301d6 100644
--- 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
index 0fafa8eec..0c712bb0c 100644
--- 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
index 72ea8f755..93aa0b369 100644
--- 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
index e35d81326..dc0324b40 100644
--- 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") {