From 8e77ff6b929cc7755f21ff276f551e45942c8157 Mon Sep 17 00:00:00 2001 From: VaL Doroshchuk Date: Mon, 2 Jul 2018 14:45:52 +0200 Subject: [PATCH] test --- src/gstreamerextras/playback/qgstreamermediaplayer.cpp | 6 ++++-- src/gstreamerextras/playback/qgstreamermediaplayer.h | 2 +- .../qgstreamermediaplayer/tst_qgstreamermediaplayer.cpp | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/gstreamerextras/playback/qgstreamermediaplayer.cpp b/src/gstreamerextras/playback/qgstreamermediaplayer.cpp index fdbb918..53551fa 100644 --- a/src/gstreamerextras/playback/qgstreamermediaplayer.cpp +++ b/src/gstreamerextras/playback/qgstreamermediaplayer.cpp @@ -509,7 +509,7 @@ static void setGstProperty(GstElement *element, const QString &name, T v) g_object_set(G_OBJECT(element), name.toLatin1().constData(), v, NULL); } -void QGstreamerMediaPlayer::set(const QString &elementName, const QVariantMap& map) +bool QGstreamerMediaPlayer::set(const QString &elementName, const QVariantMap& map) { Q_D(QGstreamerMediaPlayer); @@ -534,7 +534,7 @@ void QGstreamerMediaPlayer::set(const QString &elementName, const QVariantMap& m qWarning() << "No pipeline available"; } - return; + return false; } for (auto it = map.begin(); it != map.end(); ++it) { @@ -558,6 +558,8 @@ void QGstreamerMediaPlayer::set(const QString &elementName, const QVariantMap& m break; } } + + return true; } #include "moc_qgstreamermediaplayer.cpp" diff --git a/src/gstreamerextras/playback/qgstreamermediaplayer.h b/src/gstreamerextras/playback/qgstreamermediaplayer.h index 0baa5fe..7c2bbe9 100644 --- a/src/gstreamerextras/playback/qgstreamermediaplayer.h +++ b/src/gstreamerextras/playback/qgstreamermediaplayer.h @@ -106,7 +106,7 @@ public: void setTextStream(int i); Q_INVOKABLE QVariantMap textStreamProperties(int i); - Q_INVOKABLE void set(const QString &elementName, const QVariantMap& map); + Q_INVOKABLE bool set(const QString &elementName, const QVariantMap& map); Q_SIGNALS: void sourceChanged(); diff --git a/tests/auto/integration/qgstreamermediaplayer/tst_qgstreamermediaplayer.cpp b/tests/auto/integration/qgstreamermediaplayer/tst_qgstreamermediaplayer.cpp index 9e9167b..12896f9 100644 --- a/tests/auto/integration/qgstreamermediaplayer/tst_qgstreamermediaplayer.cpp +++ b/tests/auto/integration/qgstreamermediaplayer/tst_qgstreamermediaplayer.cpp @@ -228,7 +228,7 @@ void tst_QGstreamerMediaPlayer::testSetProperty() { QVariantMap m; m["name"] = "new_name"; - control->set("source", m); + QVERIFY(control->set("source", m)); } QTEST_GUILESS_MAIN(tst_QGstreamerMediaPlayer) -- GitLab