From 4712646d24997ace16b2894c92137c7efbac89a0 Mon Sep 17 00:00:00 2001 From: Arno Date: Sat, 26 Aug 2017 12:01:10 +0200 Subject: Make WebRadio stuff work! Display stream Metadata and add songs to playlist. Make sure that nothing happens when you doubleclick on a Webradio song in there. --- playerwidget.h | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'playerwidget.h') diff --git a/playerwidget.h b/playerwidget.h index 2fb218a..aeace26 100644 --- a/playerwidget.h +++ b/playerwidget.h @@ -4,6 +4,7 @@ #include #include #include +#include #include @@ -27,9 +28,9 @@ class WebDownloader; class PlayerWidget : public QWidget { Q_OBJECT public: - enum ItemType { Artist, Album, Song, Genre }; + enum ItemType { Artist, Album, Song, Genre, WebRadio }; enum PopulateType { FilterType, IdType, EmptyType }; - enum CustomRoles { TypeRole = Qt::UserRole + 1, IdRole = Qt::UserRole + 2, FullPathRole = Qt::UserRole + 3, GenreRole = Qt::UserRole + 4, ArtistRole = Qt::UserRole + 5, TitleRole = Qt::UserRole + 6, AlbumRole = Qt::UserRole + 7, LengthRole = Qt::UserRole + 8, UrlRole = Qt::UserRole + 9 }; + enum CustomRoles { TypeRole = Qt::UserRole + 1, IdRole = Qt::UserRole + 2, FullPathRole = Qt::UserRole + 3, GenreRole = Qt::UserRole + 4, ArtistRole = Qt::UserRole + 5, TitleRole = Qt::UserRole + 6, AlbumRole = Qt::UserRole + 7, LengthRole = Qt::UserRole + 8, UrlRole = Qt::UserRole + 9, RemoteRole = Qt::UserRole + 10 }; explicit PlayerWidget(QWidget *parent = 0); ~PlayerWidget(); const QMediaPlayer* player() const { return mPlayer; } @@ -73,6 +74,8 @@ class PlayerWidget : public QWidget { void webDlDone(); void filterFromPlaylist(); void addWebRadio(); + void doMetadataChange(const QString &key, const QVariant &value); + void updateStreamData(); void mute(bool triggered); void volumeChanged(int volume); @@ -94,6 +97,7 @@ class PlayerWidget : public QWidget { void message(const QString &msg); void modelChanged(); void setWinTitle(const QString &title); + void streamDataNeedsUpdate(); private: void setupGui(); @@ -151,6 +155,7 @@ class PlayerWidget : public QWidget { bool mStarting; QStackedLayout *mSearchDirStack; WebDownloader *mWebDownloader; + QMap mOtherMeta; }; #endif // PLAYERWIDGET_H -- cgit v1.2.3-70-g09d2