remove vlc and replace by basic QMediaPlayer

2021-10-12 22:15:06 +02:00 · 2021-10-12 22:15:06 +02:00 · fe7bbed7c1
commit fe7bbed7c1
parent a567428093
10 changed files with 303 additions and 470 deletions
--- a/LenaPi/models/MusicModel.h
+++ b/LenaPi/models/MusicModel.h
@ -1,100 +0,0 @@
-#ifndef MUSICMODEL_H
-#define MUSICMODEL_H
-
-#include <QObject>
-
-#include <models/NavigationItemModel.h>
-#include <VLCQtCore/MediaList.h>
-
-class MusicModel : public QObject
-{
-    Q_OBJECT
-
-    Q_PROPERTY(QObject* pCurrentItem READ getCurrentItem NOTIFY currentItemChanged)
-    Q_PROPERTY(bool pHasNext READ hasNext NOTIFY hasNextChanged)
-    Q_PROPERTY(bool pHasPrevious READ hasPrevious NOTIFY hasPreviousChanged)
-    Q_PROPERTY(bool pIsPlaying READ isPlaying NOTIFY isPlayingChanged)
-    Q_PROPERTY(double pProgress READ getProgress NOTIFY progressChanged)
-    Q_PROPERTY(QString pMediaLength READ getMediaLength NOTIFY mediaLengthChanged)
-    Q_PROPERTY(QString pTime READ getTime NOTIFY progressChanged)
-    Q_PROPERTY(QString pMediaTitle READ getMediaTitle NOTIFY mediaTitleChanged)
-    Q_PROPERTY(int pAudioVolume READ getAudioVolume WRITE setAudioVolume NOTIFY audioVolumeChanged)
-
-signals:
-    void navigateTo(NavigationItemModel *item);
-    void currentItemChanged();
-    void play();
-    void pause();
-    void stop();
-    void previous();
-    void next();
-    void hasPreviousChanged();
-    void hasNextChanged();
-    void isPlayingChanged();
-    void progressChanged();
-    void mediaLengthChanged();
-    void mediaTitleChanged();
-    void audioVolumeChanged(int newVolume);
-
-public:
-    MusicModel(VlcInstance* instance, QObject *parent = Q_NULLPTR);
-    ~MusicModel();
-
-    void init(NavigationItemModel* item);
-
-    Q_INVOKABLE void navigateBack();
-    Q_INVOKABLE void playPause();
-    Q_INVOKABLE void stopMusic();
-    Q_INVOKABLE void playNext();
-    Q_INVOKABLE void playPrevious();
-
-    NavigationItemModel *getCurrentItem();
-
-     VlcMediaList *getMedia();
-
-    bool isPlaying() const;
-    bool hasNext() const;
-    bool hasPrevious() const;
-
-    inline int getAudioVolume() const { return mAudioVolume; }
-    /**
-     * @brief Set audio volume. Information is transferred to VlcAudio
-     * @param newVolume value between 0 and 100 (audio level in percent)
-     * Ensures that volume is inbetween 0 and 100. If this range is exceeded,
-     * the volume is set to the lowest and highest allowed value, respectively.
-     */
-    void setAudioVolume(int newVolume);
-
-    double getProgress() const;
-
-    QString getMediaTitle() const;
-    QString getMediaLength();
-    QString getTime();
-
-public slots:
-    void onNextMediaSet(VlcMedia* media);
-    void onTimeChanged(int time);
-    void onLengthChanged(int length);
-
-private:
-    void reset();
-    void clearMediaList();
-    void readMedia(const QString& path);
-    void setMediaTitle(VlcMedia* media);
-    QString timeToString(int time);
-
-
-    bool mIsPlaying = false;
-    bool mHasNext = false;
-    bool mHasPrevious = false;
-    int mCurrentMediaItemLength = 0;
-    int mCurrentTime = 0;
-    double mCurrentMediaItemProgress = 0;
-    int mAudioVolume{50};
-    QString mMediaTitle = QString("");
-    NavigationItemModel* mCurrentItem = Q_NULLPTR;
-    VlcMediaList* mMedia = Q_NULLPTR;
-    VlcInstance* mVlc = Q_NULLPTR;
-};
-
-#endif // MUSICMODEL_H