Bläddra i källkod

moved to qmeidaplayer

master
Robin Thoni 8 år sedan
förälder
incheckning
5cb095ba6d
4 ändrade filer med 16 tillägg och 59 borttagningar
  1. 0
    28
      mainwindow.cpp
  2. 0
    3
      mainwindow.h
  3. 7
    18
      radio.cpp
  4. 9
    10
      radio.h

+ 0
- 28
mainwindow.cpp Visa fil

6
 {
6
 {
7
     ui->setupUi(this);
7
     ui->setupUi(this);
8
 
8
 
9
-    //avcodec_register_all();
10
-
11
-    QAudioFormat format;
12
-    format.setSampleRate(44100);
13
-    format.setChannelCount(2);
14
-    //format.setFrequency(48000);
15
-    //format.setChannels(2);
16
-    format.setSampleSize(128000);
17
-    format.setCodec("audio/pcm");
18
-    format.setByteOrder(QAudioFormat::LittleEndian);
19
-    format.setSampleType(QAudioFormat::SignedInt);
20
-
21
-    QAudioDeviceInfo info(QAudioDeviceInfo::defaultOutputDevice());
22
-    if (!info.isFormatSupported(format))
23
-        format = info.nearestFormat(format);
24
-
25
-    qDebug() << format;
26
-
27
-    output=new QAudioOutput(format, this);
28
-    out=output->start();
29
-
30
     currentRadio = 0;
9
     currentRadio = 0;
31
     nrj = new NRJ(this);
10
     nrj = new NRJ(this);
32
     connect(nrj, SIGNAL(setupFinished()), this, SLOT(setupFinished()));
11
     connect(nrj, SIGNAL(setupFinished()), this, SLOT(setupFinished()));
63
     currentRadio = r;
42
     currentRadio = r;
64
     if(currentRadio != 0)
43
     if(currentRadio != 0)
65
     {
44
     {
66
-        connect(currentRadio, SIGNAL(streamData(QByteArray)), this, SLOT(radioData(QByteArray)));
67
         currentRadio->startStream();
45
         currentRadio->startStream();
68
     }
46
     }
69
 }
47
 }
70
-
71
-void MainWindow::radioData(QByteArray data)
72
-{
73
-    out->write(data);
74
-    //streamData.append(data);
75
-}

+ 0
- 3
mainwindow.h Visa fil

24
 private slots:
24
 private slots:
25
     void setupFinished();
25
     void setupFinished();
26
     void radioChanged(Radio* r);
26
     void radioChanged(Radio* r);
27
-    void radioData(QByteArray data);
28
 
27
 
29
 private:
28
 private:
30
     Ui::MainWindow *ui;
29
     Ui::MainWindow *ui;
31
     NRJ* nrj;
30
     NRJ* nrj;
32
     Radio* currentRadio;
31
     Radio* currentRadio;
33
-    QAudioOutput* output;
34
-    QIODevice* out;
35
 
32
 
36
 };
33
 };
37
 
34
 

+ 7
- 18
radio.cpp Visa fil

10
     currentSong = 0;
10
     currentSong = 0;
11
     songsTries = 0;
11
     songsTries = 0;
12
     streamTries = 0;
12
     streamTries = 0;
13
-    stream = 0;
14
     songTimer = new QTimer(this);
13
     songTimer = new QTimer(this);
15
     songTimer->setSingleShot(true);
14
     songTimer->setSingleShot(true);
16
     connect(songTimer, SIGNAL(timeout()), this, SLOT(songEnded()));
15
     connect(songTimer, SIGNAL(timeout()), this, SLOT(songEnded()));
16
+    player = new QMediaPlayer(this);
17
+    player->setVolume(50);
17
 }
18
 }
18
 
19
 
19
 QString Radio::getName()
20
 QString Radio::getName()
61
     return currentSong;
62
     return currentSong;
62
 }
63
 }
63
 
64
 
64
-QNetworkReply *Radio::getStream()
65
-{
66
-    return stream;
67
-}
68
-
69
 void Radio::setName(QString n)
65
 void Radio::setName(QString n)
70
 {
66
 {
71
     name = n;
67
     name = n;
151
 {
147
 {
152
     stopStream();
148
     stopStream();
153
     streamTries = 0;
149
     streamTries = 0;
154
-    stream = mgr->get(QNetworkRequest(streamUrl));
155
-    stream->setReadBufferSize(128);
156
-    connect(stream, SIGNAL(readyRead()), this, SLOT(streamRead()));
157
-    emit streamChanged(stream);
150
+    player->setMedia(streamUrl);
151
+    player->play();
158
 }
152
 }
159
 
153
 
160
 void Radio::stopStream()
154
 void Radio::stopStream()
161
 {
155
 {
162
-    if(stream != 0)
163
-    {
164
-        stream->abort();
165
-        stream->deleteLater();
166
-        stream = 0;
167
-    }
156
+  player->stop();
168
 }
157
 }
169
 
158
 
170
 void Radio::logoFinished()
159
 void Radio::logoFinished()
214
     }
203
     }
215
 }
204
 }
216
 
205
 
217
-void Radio::streamRead()
206
+/*void Radio::streamRead()
218
 {
207
 {
219
     if(stream->header(QNetworkRequest::LocationHeader).toUrl().isEmpty())
208
     if(stream->header(QNetworkRequest::LocationHeader).toUrl().isEmpty())
220
         emit streamData(stream->readAll());
209
         emit streamData(stream->readAll());
224
         stopStream();
213
         stopStream();
225
         startStream();
214
         startStream();
226
     }
215
     }
227
-}
216
+}*/
228
 
217
 
229
 void Radio::streamError()
218
 void Radio::streamError()
230
 {
219
 {

+ 9
- 10
radio.h Visa fil

7
 #include <QPixmap>
7
 #include <QPixmap>
8
 #include <QNetworkAccessManager>
8
 #include <QNetworkAccessManager>
9
 #include <QNetworkReply>
9
 #include <QNetworkReply>
10
+#include <QMediaPlayer>
10
 #include <QList>
11
 #include <QList>
11
 #include <QTimer>
12
 #include <QTimer>
12
 #include "song.h"
13
 #include "song.h"
27
     QUrl getCoverBase();
28
     QUrl getCoverBase();
28
 
29
 
29
     Song* getCurrentSong();
30
     Song* getCurrentSong();
30
-    QNetworkReply* getStream();
31
-    
31
+
32
 signals:
32
 signals:
33
     void logoDownloaded(QPixmap);
33
     void logoDownloaded(QPixmap);
34
     void songChanged(Song*);
34
     void songChanged(Song*);
35
     void nextSongsUpdated();
35
     void nextSongsUpdated();
36
-    void streamData(QByteArray);
37
-    void streamChanged(QNetworkReply*);
38
-    
39
-public slots:
40
-    void setNetworkManager(QNetworkAccessManager* m);
41
 
36
 
37
+public slots:
42
     void setName(QString n);
38
     void setName(QString n);
43
     void setClaim(QString c);
39
     void setClaim(QString c);
44
     void setTextColor(QColor c);
40
     void setTextColor(QColor c);
54
     void startStream();
50
     void startStream();
55
     void stopStream();
51
     void stopStream();
56
 
52
 
53
+public slots:
54
+    void setNetworkManager(QNetworkAccessManager* m);
55
+
57
 private slots:
56
 private slots:
58
     void logoFinished();
57
     void logoFinished();
59
     void logoError(QNetworkReply::NetworkError);
58
     void logoError(QNetworkReply::NetworkError);
61
     void songsFinished();
60
     void songsFinished();
62
     void songsError(QNetworkReply::NetworkError);
61
     void songsError(QNetworkReply::NetworkError);
63
 
62
 
64
-    void streamRead();
63
+    //void streamRead();
65
     void streamError();
64
     void streamError();
66
 
65
 
67
     void songEnded();
66
     void songEnded();
82
     QTimer* songTimer;
81
     QTimer* songTimer;
83
 
82
 
84
     QNetworkAccessManager* mgr;
83
     QNetworkAccessManager* mgr;
84
+    QMediaPlayer* player;
85
     int logoTries;
85
     int logoTries;
86
     int songsTries;
86
     int songsTries;
87
     int streamTries;
87
     int streamTries;
88
-    QNetworkReply* stream;
89
-    
88
+
90
 };
89
 };
91
 
90
 
92
 #endif // RADIO_H
91
 #endif // RADIO_H

Laddar…
Avbryt
Spara