fixed base api

nrj.cpp

@@ -18,7 +18,7 @@ QList<Radio *> NRJ::getRadios()
 void NRJ::setupPlayer()
 {
     tries = 0;
-    QNetworkReply* reply = mgr->get(QNetworkRequest(QUrl("http://players.nrjaudio.fm/live-metadata/player/nrj/v1.0/player_setup.yml")));
+    QNetworkReply* reply = mgr->get(QNetworkRequest(QUrl("http://players.nrjaudio.fm/live-metadata/player/" + radio + "/v1.0/player_setup.yml")));
     connect(reply, SIGNAL(finished()), this, SLOT(onSetupFinished()));
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onSetupError(QNetworkReply::NetworkError)));
 }
@@ -29,7 +29,7 @@ void NRJ::getAllCur()
         return;
     tries = 0;
     QUrl url = apiBase;
-    QUrlQuery query;
+    QUrlQuery query(apiBase.query());
     query.addQueryItem("act", "get_allcur");
     url.setQuery(query);
 
@@ -38,6 +38,11 @@ void NRJ::getAllCur()
     connect(reply, SIGNAL(error(QNetworkReply::NetworkError)), this, SLOT(onGetAllCurError(QNetworkReply::NetworkError)));
 }
 
+void NRJ::setRadio(QString radio)
+{
+    this->radio = radio;
+}
+
 void NRJ::onSetupFinished()
 {
     QNetworkReply* reply = (QNetworkReply*)sender();
@@ -88,7 +93,8 @@ void NRJ::onSetupError(QNetworkReply::NetworkError)
 void NRJ::onGetAllCurFinished()
 {
     QNetworkReply* reply = (QNetworkReply*)sender();
-    YAML::Node itms = YAML::Load(reply->readAll().constData())["itms"];
+    QByteArray str = reply->readAll();
+    YAML::Node itms = YAML::Load(str.constData())["itms"];
 
     for(unsigned i = 0;i < itms.size(); ++i)
     {

nrj.h

@@ -24,6 +24,7 @@ signals:
 public slots:
     void setupPlayer();
     void getAllCur();
+    void setRadio(QString radio);
 
 private slots:
     void onSetupFinished();
@@ -38,7 +39,7 @@ private:
     QUrl apiBase;
     QUrl coverBase;
     int tries;
-    
+    QString radio;
 };
 
 #endif // NRJ_H