diff options
author | Lars Knoll <lars.knoll@qt.io> | 2021-06-11 15:09:43 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2021-06-16 10:03:34 +0200 |
commit | 36fbb6ab08734aff1a73ea4ed255e06bd5aa99f8 (patch) | |
tree | e52afc1f741c9cc02bd1d502feb98966c6385679 /src/multimedia/playback/qmediaplayer.h | |
parent | 2aedeaebae20022c9015781d4a30e49d1b5a2804 (diff) |
QMediaPlayer API cleanups
Remove the autoPlay property, and split up the setSource()
method into setSource(QUrl) and setSourceDevice(QIODevice)
for more clarity.
Change-Id: I3e973fb5b6aa50f192af898f1b07769a201c6845
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
Diffstat (limited to 'src/multimedia/playback/qmediaplayer.h')
-rw-r--r-- | src/multimedia/playback/qmediaplayer.h | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index 7eb66ea1f..13d0bd90b 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -41,6 +41,7 @@ #define QMEDIAPLAYER_H #include <QtCore/qobject.h> +#include <QtCore/qurl.h> #include <QtMultimedia/qtmultimediaglobal.h> #include <QtMultimedia/qmediaenumdebug.h> #include <QtMultimedia/qaudio.h> @@ -66,7 +67,6 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QObject Q_PROPERTY(bool seekable READ isSeekable NOTIFY seekableChanged) Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged) Q_PROPERTY(PlaybackState playbackState READ playbackState NOTIFY playbackStateChanged) - Q_PROPERTY(bool autoPlay READ autoPlay WRITE setAutoPlay NOTIFY autoPlayChanged) Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusChanged) Q_PROPERTY(QMediaMetaData metaData READ metaData NOTIFY metaDataChanged) Q_PROPERTY(Error error READ error NOTIFY errorChanged) @@ -109,10 +109,6 @@ public: explicit QMediaPlayer(QObject *parent = nullptr); ~QMediaPlayer(); - // new API -// bool enableLowLatencyPlayback(bool tryEnable); -// bool isLowLatencyPlaybackEnabled() const; - QList<QMediaMetaData> audioTracks() const; QList<QMediaMetaData> videoTracks() const; QList<QMediaMetaData> subtitleTracks() const; @@ -138,7 +134,7 @@ public: QVideoSink *videoSink() const; QUrl source() const; - const QIODevice *sourceStream() const; + const QIODevice *sourceDevice() const; PlaybackState playbackState() const; MediaStatus mediaStatus() const; @@ -161,19 +157,17 @@ public: bool isAvailable() const; QMediaMetaData metaData() const; - bool autoPlay() const; - public Q_SLOTS: void play(); void pause(); void stop(); void setPosition(qint64 position); - void setAutoPlay(bool autoPlay); void setPlaybackRate(qreal rate); - void setSource(const QUrl &media, QIODevice *stream = nullptr); + void setSource(const QUrl &source); + void setSourceDevice(QIODevice *device, const QUrl &sourceUrl = QUrl()); Q_SIGNALS: void sourceChanged(const QUrl &media); @@ -183,7 +177,6 @@ Q_SIGNALS: void durationChanged(qint64 duration); void positionChanged(qint64 position); - void autoPlayChanged(bool autoPlay); void hasAudioChanged(bool available); void hasVideoChanged(bool videoAvailable); |