From 7e9f8d75c67d7b6c50ec1daf1440b7c06ec3fea0 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Thu, 15 Jan 2015 18:48:04 +0100 Subject: [PATCH] Change sky.fm to radiotunes.com --- data/data.qrc | 2 +- data/providers/radiotunes.png | Bin 0 -> 595 bytes data/providers/skyfm.png | Bin 864 -> 0 bytes .../digitallyimportedsearchprovider.cpp | 3 +-- src/internet/core/internetmodel.cpp | 2 +- .../digitally/digitallyimportedclient.cpp | 2 +- .../digitally/digitallyimportedservicebase.cpp | 6 +++--- .../digitally/digitallyimportedservicebase.h | 4 ++-- .../digitally/digitallyimportedurlhandler.cpp | 4 ++-- 9 files changed, 11 insertions(+), 12 deletions(-) create mode 100644 data/providers/radiotunes.png delete mode 100644 data/providers/skyfm.png diff --git a/data/data.qrc b/data/data.qrc index 838816aabd..162c2f7ffb 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 0000000000000000000000000000000000000000..e7e0bb83aa227090a3164d5640553f7c76104f17 GIT binary patch literal 595 zcmV-Z0<8UsP)$@KWLKy5XIl!cV7}> z8#NYN)CNn@C@46H|JDu;B8amV>LNHgItU6y9l8jvE)Hr1O&nYV1^b5J|z-!Go* zeQIVT|FJ}f80#37hhfNf0Ibr z`d6WV5TbC0DV^ZKUE2YqOpBxCD}{+vDx|Y!`;QlO2PhgPVsCG4`n0fgt$+B`;oYsa zM2})g)_{O9MI*J1wsNR5+mc-A$fiq`g-Z|KJ$^Ygc=K#B42;!UaFLp^${25NcW)q7 z+^Iw5`KIPn_pOm_O{+)u<(`$MYt>MXV;Dpp4Sxhc1}ah?a{c%9vb6vNRckKK{TiQ}7qJjd3FPx#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2ipM; z4<;>KbLYkY00Q7iL_t(I%LT!`b5vCrz~SF}?m71}yUA|C8e+0a)aYm!3)46TXDoE= z97n$Soc?Mzs3 zun;SS6LKdc7Gfh<1J)=;00pm#SFm+mXQ$h%=EW~u02@ntz zBL*Xa_1;re6=mfp9ry^wrRVm&L;gJ+aIuxsX(mi7&v;g`yS2j3<}wjr49K^)MrtF2 zbCx2GXe7$*zYiePe6iD|UBpBNtSCa@*ME+AGMMw#?gnB6+g;9CaEgfX;;2tT!b)zq zx^s!xMu-5wf4y`5*gxaXqjNrdV~OAQPxy4ZgPqk%Y?P;iAq>Ync=D1*r(<4erhKru zL?f|0Iv#Oz?~oYb&cTR-!IW!Pw?G8zgEE*@+DYdJ}7n^0a@(?mIb+G-c~z%CxMB1PWv5jpuaRId5%b%<6*Z z!8!Mzk9h4u4uD+Wn`y_Mv$2>V27F!eh^yiK| z7lr)ZTKr4&6(rvT3m@%&vXAM?W z2_fLU#~8!uxIz)umI}Jf79p}Y1D(RsN|emP#0!}fq5w98fQX=~c<+%)IGY&CFsG42 qGZ%_1VK5V_0F78^#$W{^QT_*C>`akuUbvname(), 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 bbe108de29..f6a8e53d1c 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)); diff --git a/src/internet/digitally/digitallyimportedclient.cpp b/src/internet/digitally/digitallyimportedclient.cpp index 6426196877..9609301d64 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 0fafa8eecc..1b188ce7da 100644 --- a/src/internet/digitally/digitallyimportedservicebase.cpp +++ b/src/internet/digitally/digitallyimportedservicebase.cpp @@ -244,11 +244,11 @@ DigitallyImportedService::DigitallyImportedService(Application* app, QIcon(":/providers/digitallyimported.png"), "di", app, model, true, parent) {} -SkyFmService::SkyFmService(Application* app, InternetModel* model, +RadioTunesService::RadioTunesService(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) {} + "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 72ea8f755b..16ab2bc95d 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -117,9 +117,9 @@ class DigitallyImportedService : public DigitallyImportedServiceBase { QObject* parent = nullptr); }; -class SkyFmService : public DigitallyImportedServiceBase { +class RadioTunesService : public DigitallyImportedServiceBase { public: - SkyFmService(Application* app, InternetModel* model, + RadioTunesService(Application* app, InternetModel* model, QObject* parent = nullptr); }; diff --git a/src/internet/digitally/digitallyimportedurlhandler.cpp b/src/internet/digitally/digitallyimportedurlhandler.cpp index e35d813266..dc0324b408 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") {