rm unused

radio.cpp

@@ -14,7 +14,7 @@ Radio::Radio(QObject *parent) : QObject(parent), logo(0, 0)
     songTimer->setSingleShot(true);
     connect(songTimer, SIGNAL(timeout()), this, SLOT(songEnded()));
     player = new QMediaPlayer(this);
-    player->setVolume(50);
+    player->setVolume(100);
 }
 
 QString Radio::getName()
@@ -121,7 +121,7 @@ void Radio::updateNextSongs()
 {
     songsTries = 0;
     QUrl url = apiBase;
-    QUrlQuery query;
+    QUrlQuery query(url.query());
     query.addQueryItem("act", "get_plist");
     query.addQueryItem("id_wr", QString::number(id));
     url.setQuery(query);
@@ -175,9 +175,9 @@ void Radio::logoError(QNetworkReply::NetworkError)
 
 void Radio::songsFinished()
 {
+    qDeleteAll(nextSongs);
     QNetworkReply* reply = (QNetworkReply*)sender();
     YAML::Node itms = YAML::Load(reply->readAll().constData())["itms"];
-    qDeleteAll(nextSongs);
     for(unsigned i = 1;i < itms.size(); ++i)
     {
         YAML::Node itm = itms[i];
@@ -203,18 +203,6 @@ void Radio::songsError(QNetworkReply::NetworkError)
     }
 }
 
-/*void Radio::streamRead()
-{
-    if(stream->header(QNetworkRequest::LocationHeader).toUrl().isEmpty())
-        emit streamData(stream->readAll());
-    else
-    {
-        streamUrl = stream->header(QNetworkRequest::LocationHeader).toUrl();
-        stopStream();
-        startStream();
-    }
-}*/
-
 void Radio::streamError()
 {
     if(streamTries < 3)

radio.h

@@ -50,7 +50,6 @@ public slots:
     void startStream();
     void stopStream();
 
-public slots:
     void setNetworkManager(QNetworkAccessManager* m);
 
 private slots:
@@ -60,7 +59,6 @@ private slots:
     void songsFinished();
     void songsError(QNetworkReply::NetworkError);
 
-    //void streamRead();
     void streamError();
 
     void songEnded();