diff options
Diffstat (limited to 'examples')
5 files changed, 19 insertions, 6 deletions
diff --git a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp index df8222432..cf2fcbd7b 100644 --- a/examples/multimedia/video/qmlvideofilter_opencl/main.cpp +++ b/examples/multimedia/video/qmlvideofilter_opencl/main.cpp @@ -88,7 +88,7 @@ public: qreal factor() const { return m_factor; } void setFactor(qreal v); - QVideoFilterRunnable *createFilterRunnable() Q_DECL_OVERRIDE; + QVideoFilterRunnable *createFilterRunnable() override; signals: void factorChanged(); @@ -102,7 +102,7 @@ class CLFilterRunnable : public QVideoFilterRunnable public: CLFilterRunnable(CLFilter *filter); ~CLFilterRunnable(); - QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) Q_DECL_OVERRIDE; + QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) override; private: void releaseTextures(); @@ -423,7 +423,7 @@ class InfoFilter : public QAbstractVideoFilter Q_OBJECT public: - QVideoFilterRunnable *createFilterRunnable() Q_DECL_OVERRIDE; + QVideoFilterRunnable *createFilterRunnable() override; signals: void finished(QObject *result); @@ -436,7 +436,7 @@ class InfoFilterRunnable : public QVideoFilterRunnable { public: InfoFilterRunnable(InfoFilter *filter) : m_filter(filter) { } - QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) Q_DECL_OVERRIDE; + QVideoFrame run(QVideoFrame *input, const QVideoSurfaceFormat &surfaceFormat, RunFlags flags) override; private: InfoFilter *m_filter; diff --git a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp index 2f5c16d5e..7ee3eb541 100644 --- a/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp +++ b/examples/multimediawidgets/customvideosurface/customvideowidget/videowidget.cpp @@ -102,7 +102,7 @@ void VideoWidget::paintEvent(QPaintEvent *event) QBrush brush = palette().background(); - foreach (const QRect &rect, region.rects()) + for (const QRect &rect : region) painter.fillRect(rect, brush); } diff --git a/examples/multimediawidgets/player/main.cpp b/examples/multimediawidgets/player/main.cpp index 9e6d9358c..a20fb1c4f 100644 --- a/examples/multimediawidgets/player/main.cpp +++ b/examples/multimediawidgets/player/main.cpp @@ -63,14 +63,21 @@ int main(int argc, char *argv[]) QCoreApplication::setOrganizationName("QtProject"); QCoreApplication::setApplicationVersion(QT_VERSION_STR); QCommandLineParser parser; + QCommandLineOption customAudioRoleOption("custom-audio-role", + "Set a custom audio role for the player.", + "role"); parser.setApplicationDescription("Qt MultiMedia Player Example"); parser.addHelpOption(); parser.addVersionOption(); - parser.addPositionalArgument("url", "The URL to open."); + parser.addOption(customAudioRoleOption); + parser.addPositionalArgument("url", "The URL(s) to open."); parser.process(app); Player player; + if (parser.isSet(customAudioRoleOption)) + player.setCustomAudioRole(parser.value(customAudioRoleOption)); + if (!parser.positionalArguments().isEmpty() && player.isPlayerAvailable()) { QList<QUrl> urls; for (auto &a: parser.positionalArguments()) diff --git a/examples/multimediawidgets/player/player.cpp b/examples/multimediawidgets/player/player.cpp index 8113df70e..4d3340855 100644 --- a/examples/multimediawidgets/player/player.cpp +++ b/examples/multimediawidgets/player/player.cpp @@ -234,6 +234,11 @@ void Player::addToPlaylist(const QList<QUrl> &urls) } } +void Player::setCustomAudioRole(const QString &role) +{ + m_player->setCustomAudioRole(role); +} + void Player::durationChanged(qint64 duration) { m_duration = duration / 1000; diff --git a/examples/multimediawidgets/player/player.h b/examples/multimediawidgets/player/player.h index 1b30204f9..a15d27bd7 100644 --- a/examples/multimediawidgets/player/player.h +++ b/examples/multimediawidgets/player/player.h @@ -81,6 +81,7 @@ public: bool isPlayerAvailable() const; void addToPlaylist(const QList<QUrl> &urls); + void setCustomAudioRole(const QString &role); signals: void fullScreenChanged(bool fullScreen); |