diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2021-02-11 20:59:34 +0100 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2021-02-17 08:27:27 +0000 |
| commit | a200375e8a792ca112daa9c521ff682d1539815e (patch) | |
| tree | 16ea4e24fcdd35ee1e64cdc601ae5a2b90bdb8dd /src/multimedia/playback/qmediaplayer.h | |
| parent | 0b89496b68e077b3a761b6d5dea41006b9fb5d38 (diff) | |
Remove the QMediaSource inheritance from QMediaPlayer
Change-Id: I564aecdbb11df268b40fba6f53c6e2624b056a13
Reviewed-by: Doris Verria <doris.verria@qt.io>
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
| -rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 97995f096..cfd4de9ed 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -40,8 +40,8 @@ #ifndef QMEDIAPLAYER_H #define QMEDIAPLAYER_H +#include <QtCore/qobject.h> #include <QtMultimedia/qtmultimediaglobal.h> -#include <QtMultimedia/qmediasource.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> @@ -50,9 +50,10 @@ QT_BEGIN_NAMESPACE class QAbstractVideoSurface; class QAudioDeviceInfo; +class QMediaMetaData; class QMediaPlayerPrivate; -class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaSource +class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QObject { Q_OBJECT Q_PROPERTY(int notifyInterval READ notifyInterval WRITE setNotifyInterval NOTIFY notifyIntervalChanged) @@ -70,6 +71,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaSource Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusChanged) Q_PROPERTY(QAudio::Role audioRole READ audioRole WRITE setAudioRole NOTIFY audioRoleChanged) Q_PROPERTY(QString customAudioRole READ customAudioRole WRITE setCustomAudioRole NOTIFY customAudioRoleChanged) + Q_PROPERTY(QMediaMetaData metaData READ metaData NOTIFY metaDataChanged) Q_PROPERTY(QString error READ errorString) Q_ENUMS(State) Q_ENUMS(MediaStatus) @@ -161,7 +163,8 @@ public: Error error() const; QString errorString() const; - QMultimedia::AvailabilityStatus availability() const override; + bool isAvailable() const; + QMediaMetaData metaData() const; QAudio::Role audioRole() const; void setAudioRole(QAudio::Role audioRole); @@ -207,6 +210,8 @@ Q_SIGNALS: void audioRoleChanged(QAudio::Role role); void customAudioRoleChanged(const QString &role); + void metaDataChanged(); + void error(QMediaPlayer::Error error); private: |