From c40077648a603d003aef3a54e0d3cd80e3e217d9 Mon Sep 17 00:00:00 2001 From: Arno Date: Sun, 18 Feb 2018 13:54:07 +0100 Subject: Play WebRadio again To make this work, remove duplicate Enums from PlayerWidget. Btw, WebRadio was defined twice: as ModelType and as ItemTime, with the former always taking preference. Doesn't really matter, because I think I have to completely revamp the WebRadio handling... --- playerwidget.h | 7 ------- 1 file changed, 7 deletions(-) (limited to 'playerwidget.h') diff --git a/playerwidget.h b/playerwidget.h index 3d190a7..050418f 100644 --- a/playerwidget.h +++ b/playerwidget.h @@ -30,17 +30,12 @@ class QSplashScreen; class PlayerWidget : public QWidget { Q_OBJECT public: - 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, RemoteRole = Qt::UserRole + 10 }; - enum ModelType { Webradio, Favorites, Folders, DoNotCare }; explicit PlayerWidget(QSplashScreen *splash, QWidget *parent = nullptr); ~PlayerWidget(); const QMediaPlayer* player() const { return mPlayer; } public slots: void rightCurrentChanged(const QModelIndex &cur, const QModelIndex &prev); - void leftCurrentChanged(const QModelIndex &cur, const QModelIndex &prev); void doPlay(); void doStop(); void doPause(); @@ -120,8 +115,6 @@ class PlayerWidget : public QWidget { bool mStarting; WebDownloader *mWebDownloader; QMap mOtherMeta; - bool mIsStream; - int mModelType; QStackedWidget *mCollectionStack; }; -- cgit v1.2.3-70-g09d2