diff options
author | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-02-09 16:40:48 +0100 |
---|---|---|
committer | Piotr Srebrny <piotr.srebrny@qt.io> | 2022-02-17 10:08:04 +0100 |
commit | dfb0baa56983455f6a15b7453c619c1bbc0fc1c3 (patch) | |
tree | 63f3fac204418cdf71c9b1c4d7358724285da5b8 | |
parent | ecb0aa5f1116824286b764e136d5ec198b1a1995 (diff) |
Resolve QSoundEffect URL through QML context
Simiar to QMediaPlayer resolve the source URL using QML context URL
resolver.
Fixes: QTBUG-100638
Change-Id: I4776e66abbb8689dd1941b23512e7f621c864a57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
(cherry picked from commit 9c6ae9afddc0494cc93b8bf05e51944a4ddf5e26)
-rw-r--r-- | src/multimediaquick/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/multimediaquick/qquicksoundeffect_p.h | 92 | ||||
-rw-r--r-- | src/multimediaquick/qtmultimediaquicktypes_p.h | 9 |
3 files changed, 94 insertions, 8 deletions
diff --git a/src/multimediaquick/CMakeLists.txt b/src/multimediaquick/CMakeLists.txt index c3d95dd0c..9a933be6e 100644 --- a/src/multimediaquick/CMakeLists.txt +++ b/src/multimediaquick/CMakeLists.txt @@ -22,6 +22,7 @@ qt_internal_add_qml_module(MultimediaQuickPrivate qquickimagepreviewprovider.cpp qquickimagepreviewprovider_p.h # qquickplaylist.cpp qquickplaylist_p.h qquickmediaplayer_p.h + qquicksoundeffect_p.h qquickvideooutput.cpp qquickvideooutput_p.h qsgvideonode_p.cpp qsgvideonode_p.h qsgvideotexture.cpp qsgvideotexture_p.h diff --git a/src/multimediaquick/qquicksoundeffect_p.h b/src/multimediaquick/qquicksoundeffect_p.h new file mode 100644 index 000000000..c50f1435d --- /dev/null +++ b/src/multimediaquick/qquicksoundeffect_p.h @@ -0,0 +1,92 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the plugins of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QQUICKSOUNDEFFECT_H +#define QQUICKSOUNDEFFECT_H + +// +// W A R N I N G +// ------------- +// +// This file is not part of the Qt API. It exists for the convenience +// of other Qt classes. This header file may change from version to +// version without notice, or even be removed. +// +// We mean it. +// + +#include <QSoundEffect> +#include <QtQml/qqml.h> +#include <QtQml/qqmlcontext.h> +#include <private/qtmultimediaquickglobal_p.h> + +QT_BEGIN_NAMESPACE + +class Q_MULTIMEDIAQUICK_EXPORT QQuickSoundEffect : public QSoundEffect +{ + Q_OBJECT + Q_PROPERTY(QUrl source READ qmlSource WRITE qmlSetSource NOTIFY sourceChanged) + QML_NAMED_ELEMENT(SoundEffect) + +public: + QQuickSoundEffect(QObject *parent = nullptr) : QSoundEffect(parent) {} + + void qmlSetSource(const QUrl &source) + { + if (m_source == source) + return; + + m_source = source; + const QQmlContext *context = qmlContext(this); + setSource(context ? context->resolvedUrl(source) : source); + emit sourceChanged(source); + } + + QUrl qmlSource() const { return m_source; } + +Q_SIGNALS: + void sourceChanged(const QUrl &source); + +private: + QUrl m_source; +}; + +QT_END_NAMESPACE + +#endif diff --git a/src/multimediaquick/qtmultimediaquicktypes_p.h b/src/multimediaquick/qtmultimediaquicktypes_p.h index c9bb47bee..18ee97bfa 100644 --- a/src/multimediaquick/qtmultimediaquicktypes_p.h +++ b/src/multimediaquick/qtmultimediaquicktypes_p.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2021 The Qt Company +** Copyright (C) 2022 The Qt Company ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -57,13 +57,6 @@ QT_BEGIN_NAMESPACE -struct QSoundEffectForeign -{ - Q_GADGET - QML_FOREIGN(QSoundEffect) - QML_NAMED_ELEMENT(SoundEffect) -}; - struct QMediaCaptureSessionForeign { Q_GADGET |