summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2021-02-25 13:11:47 +0100
committerLars Knoll <lars.knoll@qt.io>2021-03-15 20:08:34 +0000
commitf84a85c296770f27ba59b39b24b8d4fce0d4e669 (patch)
treec99de479f71c9757711b2fa77a6f52cdde6c18d5
parentff333fb48682e8c18f3bf8a25cc16d6370871979 (diff)
Forward metadata from the windows backend to the frontend
Like that we do now see some meta data in the player example. Change-Id: I3296d220aefb7f0e2d19867a4460e16ebd57b658 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Doris Verria <doris.verria@qt.io>
-rw-r--r--src/imports/multimedia/qmldir1
-rw-r--r--src/multimedia/platform/windows/player/mfplayercontrol.cpp5
-rw-r--r--src/multimedia/platform/windows/player/mfplayercontrol_p.h48
3 files changed, 31 insertions, 23 deletions
diff --git a/src/imports/multimedia/qmldir b/src/imports/multimedia/qmldir
index d68049f63..e7dcc3dd6 100644
--- a/src/imports/multimedia/qmldir
+++ b/src/imports/multimedia/qmldir
@@ -4,3 +4,4 @@ classname QMultimediaDeclarativeModule
typeinfo plugins.qmltypes
typeinfo plugins.qmltypes
Video 5.0 Video.qml
+
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol.cpp b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
index 3e2ac1656..d14494f6a 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol.cpp
+++ b/src/multimedia/platform/windows/player/mfplayercontrol.cpp
@@ -121,6 +121,11 @@ void MFPlayerControl::stop()
refreshState();
}
+QMediaMetaData MFPlayerControl::metaData() const
+{
+ return m_session->metaData();
+}
+
bool MFPlayerControl::setAudioOutput(const QAudioDeviceInfo &info)
{
return m_session->setAudioOutput(info);
diff --git a/src/multimedia/platform/windows/player/mfplayercontrol_p.h b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
index 4a487828a..834b63537 100644
--- a/src/multimedia/platform/windows/player/mfplayercontrol_p.h
+++ b/src/multimedia/platform/windows/player/mfplayercontrol_p.h
@@ -66,42 +66,44 @@ public:
MFPlayerControl(QMediaPlayer *player);
~MFPlayerControl();
- QMediaPlayer::State state() const;
+ QMediaPlayer::State state() const override;
- QMediaPlayer::MediaStatus mediaStatus() const;
+ QMediaPlayer::MediaStatus mediaStatus() const override;
- qint64 duration() const;
+ qint64 duration() const override;
- qint64 position() const;
- void setPosition(qint64 position);
+ qint64 position() const override;
+ void setPosition(qint64 position) override;
- int volume() const;
- void setVolume(int volume);
+ int volume() const override;
+ void setVolume(int volume) override;
- bool isMuted() const;
- void setMuted(bool muted);
+ bool isMuted() const override;
+ void setMuted(bool muted) override;
- int bufferStatus() const;
+ int bufferStatus() const override;
- bool isAudioAvailable() const;
- bool isVideoAvailable() const;
+ bool isAudioAvailable() const override;
+ bool isVideoAvailable() const override;
- bool isSeekable() const;
+ bool isSeekable() const override;
- QMediaTimeRange availablePlaybackRanges() const;
+ QMediaTimeRange availablePlaybackRanges() const override;
- qreal playbackRate() const;
- void setPlaybackRate(qreal rate);
+ qreal playbackRate() const override;
+ void setPlaybackRate(qreal rate) override;
- QUrl media() const;
- const QIODevice *mediaStream() const;
- void setMedia(const QUrl &media, QIODevice *stream);
+ QUrl media() const override;
+ const QIODevice *mediaStream() const override;
+ void setMedia(const QUrl &media, QIODevice *stream) override;
- void play();
- void pause();
- void stop();
+ void play() override;
+ void pause() override;
+ void stop() override;
- bool streamPlaybackSupported() const { return true; }
+ bool streamPlaybackSupported() const override { return true; }
+
+ QMediaMetaData metaData() const override;
bool setAudioOutput(const QAudioDeviceInfo &) override;
QAudioDeviceInfo audioOutput() const override;