diff options
author | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-06-02 10:56:48 +0200 |
---|---|---|
committer | VaL Doroshchuk <valentyn.doroshchuk@qt.io> | 2020-08-03 11:31:17 +0200 |
commit | 9c9bc7e6b95bb3c3d4f5347b6c70cbd15c74c69c (patch) | |
tree | 74df82b4ea1e7c617f7664ac90eef5ec3be94207 /examples | |
parent | a553c7d1b63defc963a043e363f8d75d255e9c72 (diff) |
Remove AudioEngine
Task-number: QTBUG-74423
Fixes: QTBUG-84596
Change-Id: I21184ee24cbcbd5091e3466b132301e80bfad7d8
Reviewed-by: Liang Qi <liang.qi@qt.io>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/multimedia/audioengine/audioengine.pro | 6 | ||||
-rw-r--r-- | examples/multimedia/audioengine/doc/src/audioengine.qdoc | 38 | ||||
-rw-r--r-- | examples/multimedia/audioengine/qml/audioengine.qml | 203 | ||||
-rw-r--r-- | examples/multimedia/audioengine/qml/audioengine.qmlproject | 16 | ||||
-rw-r--r-- | examples/multimedia/audioengine/qml/content/MyAudioEngine.qml | 128 | ||||
-rw-r--r-- | examples/multimedia/audioengine/qml/content/engine-loop.wav | bin | 104186 -> 0 bytes | |||
-rw-r--r-- | examples/multimedia/audioengine/qml/content/horn.wav | bin | 36060 -> 0 bytes | |||
-rw-r--r-- | examples/multimedia/audioengine/qml/content/whistle.wav | bin | 64132 -> 0 bytes | |||
-rw-r--r-- | examples/multimedia/multimedia.pro | 2 |
9 files changed, 0 insertions, 393 deletions
diff --git a/examples/multimedia/audioengine/audioengine.pro b/examples/multimedia/audioengine/audioengine.pro deleted file mode 100644 index 84bc492bc..000000000 --- a/examples/multimedia/audioengine/audioengine.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs - -# These examples contain no C++ and can simply be copied -SUBDIRS = -EXAMPLE_FILES = qml - diff --git a/examples/multimedia/audioengine/doc/src/audioengine.qdoc b/examples/multimedia/audioengine/doc/src/audioengine.qdoc deleted file mode 100644 index 6cc1e6118..000000000 --- a/examples/multimedia/audioengine/doc/src/audioengine.qdoc +++ /dev/null @@ -1,38 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** 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 Free Documentation License Usage -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. Please review the following information to ensure -** the GNU Free Documentation License version 1.3 requirements -** will be met: https://www.gnu.org/licenses/fdl-1.3.html. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \example multimedia/audioengine - \title AudioEngine Example - \ingroup multimedia_examples - \brief Enabling 3D sound control using the Qt Audio Engine API. - - \e{Audio Engine} demonstrates 3D sound control using the - \l{Qt Audio Engine QML Types}{Qt Audio Engine} API. - - \include examples-run.qdocinc -*/ diff --git a/examples/multimedia/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml deleted file mode 100644 index 212eb6567..000000000 --- a/examples/multimedia/audioengine/qml/audioengine.qml +++ /dev/null @@ -1,203 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2017 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the examples of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** 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. - ** - ** BSD License Usage - ** Alternatively, you may use this file under the terms of the BSD license - ** as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of The Qt Company Ltd nor the names of its - ** contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. - ** - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - -import QtAudioEngine 1.0 -import QtQuick 2.0 -import "content" - -Rectangle { - color:"white" - id: root - width: 300 - height: 500 - property int radius : 100 - property real twoPi : Math.PI + Math.PI - - MyAudioEngine { - id:audioEngine - listener.position : Qt.vector3d(observer.x, observer.y, 0); - } - - Item { - id: circle - x: root.width / 2 - y: root.height / 2 - property real percent: 0 - SequentialAnimation on percent { - id: circleAnim1 - loops: Animation.Infinite - running: true - NumberAnimation { - duration: 12000 - from: 0 - to: 1 - } - - } - } - - Item { - id: holder - x: circle.x - Math.sin(circle.percent * root.twoPi) * root.radius - 50 - y: circle.y + Math.cos(circle.percent * root.twoPi) * root.radius + 50 - } - - Rectangle { - color:"green" - id: observer - width: 16 - height: 16 - x: circle.x - width / 2 - y: circle.y - height / 2 - } - Rectangle { - color:"red" - id: starship - width: 32 - height: 32 - x: holder.x - width / 2 - y: holder.y - height / 2 - } - MouseArea { - anchors.fill: parent - onClicked: { - audioEngine.sounds["effects"].play(Qt.vector3d(holder.x, holder.y, 0)); - } - } - - SoundInstance { - id: shipSound - engine:audioEngine - sound:"shipengine" - position: Qt.vector3d(holder.x, holder.y, 0) - direction: { - var a = (starship.rotation / 360) * root.twoPi; - return Qt.vector3d(Math.sin(a), -Math.cos(a), 0); - } - velocity: { - var speed = root.twoPi * root.radius / 4; - return shipSound.direction.times(speed); - } - - Component.onCompleted: shipSound.play() - } - - //Category Volume Control - Rectangle { - property variant volumeCtrl: audioEngine.categories["sfx"]; - id: volumeBar - x: 10 - y: 10 - width: 280 - height: 22 - color: "darkgray" - Rectangle { - id: volumeTracker - x: 0 - y: 0 - width: volumeBar.volumeCtrl.volume * parent.width; - height: parent.height - color: "lightgreen" - } - Text { - text: " volume:" + Math.round(volumeBar.volumeCtrl.volume * 100) +"%"; - font.pointSize: 16; - font.italic: true; - color: "black" - anchors.fill: parent - } - - MouseArea { - anchors.fill: parent - property bool m:false - onPressed: { - m = true; - updateVolume(mouse); - } - onReleased: { - m = false; - } - - onPositionChanged: { - if (m) { - updateVolume(mouse); - } - } - function updateVolume(mouse) { - volumeBar.volumeCtrl.volume = Math.min(1, Math.max(0, mouse.x / (volumeBar.width - 1))); - } - } - } - - //Information display - Item { - x:10 - y:32 - Text { - text: " [live instances] = " + audioEngine.liveInstances; - font.pointSize: 14; - font.italic: true; - color: "black" - anchors.fill: parent - } - } - - Item { - x:10 - y:60 - Text { - text: " [loading]=" + (audioEngine.loading ? "true" : "false"); - font.pointSize: 16; - font.italic: true; - color: "black" - anchors.fill: parent - } - } -} diff --git a/examples/multimedia/audioengine/qml/audioengine.qmlproject b/examples/multimedia/audioengine/qml/audioengine.qmlproject deleted file mode 100644 index 15b002b1a..000000000 --- a/examples/multimedia/audioengine/qml/audioengine.qmlproject +++ /dev/null @@ -1,16 +0,0 @@ -import QmlProject 1.1 - -Project { - mainFile: "audioengine.qml" - - /* Include .qml, .js, and image files from current directory and subdirectories */ - QmlFiles { - directory: "." - } - JavaScriptFiles { - directory: "." - } - ImageFiles { - directory: "." - } -} diff --git a/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml deleted file mode 100644 index 1a99557df..000000000 --- a/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml +++ /dev/null @@ -1,128 +0,0 @@ -/**************************************************************************** - ** - ** Copyright (C) 2017 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** - ** This file is part of the examples of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:BSD$ - ** 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. - ** - ** BSD License Usage - ** Alternatively, you may use this file under the terms of the BSD license - ** as follows: - ** - ** "Redistribution and use in source and binary forms, with or without - ** modification, are permitted provided that the following conditions are - ** met: - ** * Redistributions of source code must retain the above copyright - ** notice, this list of conditions and the following disclaimer. - ** * Redistributions in binary form must reproduce the above copyright - ** notice, this list of conditions and the following disclaimer in - ** the documentation and/or other materials provided with the - ** distribution. - ** * Neither the name of The Qt Company Ltd nor the names of its - ** contributors may be used to endorse or promote products derived - ** from this software without specific prior written permission. - ** - ** - ** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - ** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR - ** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT - ** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - ** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - ** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - ** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - ** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - ** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - ** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." - ** - ** $QT_END_LICENSE$ - ** - ****************************************************************************/ - -import QtAudioEngine 1.0 -import QtQuick 2.0 - -AudioEngine { - - AudioCategory { - name:"sfx" - volume: 1 - } - - AudioCategory { - name:"music" - volume: 1 - } - - - AttenuationModelInverse { - name:"default" - start: 20 - end: 1000 - rolloff: 1 - } - - AttenuationModelLinear { - name:"shipengine" - start: 20 - end: 180 - } - - AudioSample { - name:"engine" - source: "engine-loop.wav" - preloaded:true - } - - AudioSample { - name:"horn" - source: "horn.wav" - } - AudioSample { - name:"whistle" - source: "whistle.wav" - } - Sound { - name:"shipengine" - attenuationModel:"shipengine" - category:"sfx" - PlayVariation { - looping:true - sample:"engine" - maxGain:0.9 - minGain:0.8 - } - } - - Sound { - name:"effects" - category:"sfx" - PlayVariation { - sample:"horn" - maxGain:2.0 - minGain:0.9 - } - PlayVariation { - sample:"whistle" - maxGain:1.0 - minGain:0.8 - } - } - - dopplerFactor: 1 - speedOfSound: 343.33 - - listener.up:"0,0,1" - listener.position:"0,0,0" - listener.velocity:"0,0,0" - listener.direction:"0,1,0" -} diff --git a/examples/multimedia/audioengine/qml/content/engine-loop.wav b/examples/multimedia/audioengine/qml/content/engine-loop.wav Binary files differdeleted file mode 100644 index 923813694..000000000 --- a/examples/multimedia/audioengine/qml/content/engine-loop.wav +++ /dev/null diff --git a/examples/multimedia/audioengine/qml/content/horn.wav b/examples/multimedia/audioengine/qml/content/horn.wav Binary files differdeleted file mode 100644 index 209f2dc52..000000000 --- a/examples/multimedia/audioengine/qml/content/horn.wav +++ /dev/null diff --git a/examples/multimedia/audioengine/qml/content/whistle.wav b/examples/multimedia/audioengine/qml/content/whistle.wav Binary files differdeleted file mode 100644 index f890b791f..000000000 --- a/examples/multimedia/audioengine/qml/content/whistle.wav +++ /dev/null diff --git a/examples/multimedia/multimedia.pro b/examples/multimedia/multimedia.pro index f49988c31..a221d4bb5 100644 --- a/examples/multimedia/multimedia.pro +++ b/examples/multimedia/multimedia.pro @@ -19,5 +19,3 @@ qtHaveModule(quick) { video } -qtConfig(openal): SUBDIRS += audioengine - |