moved to qmeidaplayer

mainwindow.cpp

@@ -6,27 +6,6 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), ui(new Ui::MainWi
 {
     ui->setupUi(this);
 
-    //avcodec_register_all();
-
-    QAudioFormat format;
-    format.setSampleRate(44100);
-    format.setChannelCount(2);
-    //format.setFrequency(48000);
-    //format.setChannels(2);
-    format.setSampleSize(128000);
-    format.setCodec("audio/pcm");
-    format.setByteOrder(QAudioFormat::LittleEndian);
-    format.setSampleType(QAudioFormat::SignedInt);
-
-    QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
-    if (!info.isFormatSupported(format))
-        format = info.nearestFormat(format);
-
-    qDebug() << format;
-
-    output=new QAudioOutput(format, this);
-    out=output->start();
-
     currentRadio = 0;
     nrj = new NRJ(this);
     connect(nrj, SIGNAL(setupFinished()), this, SLOT(setupFinished()));
@@ -63,13 +42,6 @@ void MainWindow::radioChanged(Radio *r)
     currentRadio = r;
     if(currentRadio != 0)
     {
-        connect(currentRadio, SIGNAL(streamData(QByteArray)), this, SLOT(radioData(QByteArray)));
         currentRadio->startStream();
     }
 }
-
-void MainWindow::radioData(QByteArray data)
-{
-    out->write(data);
-    //streamData.append(data);
-}

mainwindow.h

@@ -24,14 +24,11 @@ public:
 private slots:
     void setupFinished();
     void radioChanged(Radio* r);
-    void radioData(QByteArray data);
 
 private:
     Ui::MainWindow *ui;
     NRJ* nrj;
     Radio* currentRadio;
-    QAudioOutput* output;
-    QIODevice* out;
 
 };
 

radio.cpp

@@ -10,10 +10,11 @@ Radio::Radio(QObject *parent) : QObject(parent), logo(0, 0)
     currentSong = 0;
     songsTries = 0;
     streamTries = 0;
-    stream = 0;
     songTimer = new QTimer(this);
     songTimer->setSingleShot(true);
     connect(songTimer, SIGNAL(timeout()), this, SLOT(songEnded()));
+    player = new QMediaPlayer(this);
+    player->setVolume(50);
 }
 
 QString Radio::getName()
@@ -61,11 +62,6 @@ Song *Radio::getCurrentSong()
     return currentSong;
 }
 
-QNetworkReply *Radio::getStream()
-{
-    return stream;
-}
-
 void Radio::setName(QString n)
 {
     name = n;
@@ -151,20 +147,13 @@ void Radio::startStream()
 {
     stopStream();
     streamTries = 0;
-    stream = mgr->get(QNetworkRequest(streamUrl));
-    stream->setReadBufferSize(128);
-    connect(stream, SIGNAL(readyRead()), this, SLOT(streamRead()));
-    emit streamChanged(stream);
+    player->setMedia(streamUrl);
+    player->play();
 }
 
 void Radio::stopStream()
 {
-    if(stream != 0)
-    {
-        stream->abort();
-        stream->deleteLater();
-        stream = 0;
-    }
+  player->stop();
 }
 
 void Radio::logoFinished()
@@ -214,7 +203,7 @@ void Radio::songsError(QNetworkReply::NetworkError)
     }
 }
 
-void Radio::streamRead()
+/*void Radio::streamRead()
 {
     if(stream->header(QNetworkRequest::LocationHeader).toUrl().isEmpty())
         emit streamData(stream->readAll());
@@ -224,7 +213,7 @@ void Radio::streamRead()
         stopStream();
         startStream();
     }
-}
+}*/
 
 void Radio::streamError()
 {

radio.h

@@ -7,6 +7,7 @@
 #include <QPixmap>
 #include <QNetworkAccessManager>
 #include <QNetworkReply>
+#include <QMediaPlayer>
 #include <QList>
 #include <QTimer>
 #include "song.h"
@@ -27,18 +28,13 @@ public:
     QUrl getCoverBase();
 
     Song* getCurrentSong();
-    QNetworkReply* getStream();
-    
+
 signals:
     void logoDownloaded(QPixmap);
     void songChanged(Song*);
     void nextSongsUpdated();
-    void streamData(QByteArray);
-    void streamChanged(QNetworkReply*);
-    
-public slots:
-    void setNetworkManager(QNetworkAccessManager* m);
 
+public slots:
     void setName(QString n);
     void setClaim(QString c);
     void setTextColor(QColor c);
@@ -54,6 +50,9 @@ public slots:
     void startStream();
     void stopStream();
 
+public slots:
+    void setNetworkManager(QNetworkAccessManager* m);
+
 private slots:
     void logoFinished();
     void logoError(QNetworkReply::NetworkError);
@@ -61,7 +60,7 @@ private slots:
     void songsFinished();
     void songsError(QNetworkReply::NetworkError);
 
-    void streamRead();
+    //void streamRead();
     void streamError();
 
     void songEnded();
@@ -82,11 +81,11 @@ private:
     QTimer* songTimer;
 
     QNetworkAccessManager* mgr;
+    QMediaPlayer* player;
     int logoTries;
     int songsTries;
     int streamTries;
-    QNetworkReply* stream;
-    
+
 };
 
 #endif // RADIO_H