summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-03-18 18:08:32 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-04-07 12:08:01 +0000
commit0cd222c9b4d9658feddf427fa0a58cfe5cdba504 (patch)
tree2e52b6955a54915d408e78d1d84d482f66695164 /examples/multimedia
parent197373b2d10daa6c5904ed9295a2d6c6ed2c8b1d (diff)
Fix audioengine example.
- Add missing audio files - Fix 'Unable to assign double to QVector3D' warning - Don't show decimal part of the volume Task-number: QTBUG-41841 Task-number: QTBUG-44304 Change-Id: Ie24284242bbac0d10bd85841932c506d7634a514 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'examples/multimedia')
-rw-r--r--examples/multimedia/audioengine/qml/audioengine.qml6
-rw-r--r--examples/multimedia/audioengine/qml/content/MyAudioEngine.qml39
-rw-r--r--examples/multimedia/audioengine/qml/content/engine-loop.wavbin0 -> 104186 bytes
-rw-r--r--examples/multimedia/audioengine/qml/content/horn.wavbin0 -> 36060 bytes
-rw-r--r--examples/multimedia/audioengine/qml/content/whistle.wavbin0 -> 64132 bytes
5 files changed, 16 insertions, 29 deletions
diff --git a/examples/multimedia/audioengine/qml/audioengine.qml b/examples/multimedia/audioengine/qml/audioengine.qml
index 3907f906b..fb3394246 100644
--- a/examples/multimedia/audioengine/qml/audioengine.qml
+++ b/examples/multimedia/audioengine/qml/audioengine.qml
@@ -65,7 +65,7 @@ Rectangle {
loops: Animation.Infinite
running: true
NumberAnimation {
- duration: 8000
+ duration: 12000
from: 0
to: 1
}
@@ -113,7 +113,7 @@ Rectangle {
}
velocity: {
var speed = root.twoPi * root.radius / 4;
- return shipSound.direction * speed;
+ return shipSound.direction.times(speed);
}
Component.onCompleted: shipSound.play()
@@ -137,7 +137,7 @@ Rectangle {
color: "lightgreen"
}
Text {
- text: " volume:" + volumeBar.volumeCtrl.volume * 100 +"%";
+ text: " volume:" + Math.round(volumeBar.volumeCtrl.volume * 100) +"%";
font.pointSize: 16;
font.italic: true;
color: "black"
diff --git a/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
index dc6666c4b..1cf92eb94 100644
--- a/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
+++ b/examples/multimedia/audioengine/qml/content/MyAudioEngine.qml
@@ -68,22 +68,18 @@ AudioEngine {
}
AudioSample {
- name:"fire"
- source: "fire-03-loop.wav"
+ name:"engine"
+ source: "engine-loop.wav"
preloaded:true
}
AudioSample {
- name:"explosion"
- source: "explosion-02.wav"
+ name:"horn"
+ source: "horn.wav"
}
AudioSample {
- name:"lava"
- source: "lava-bubbling-01.wav"
- }
- AudioSample {
- name:"water"
- source: "running-water-01.wav"
+ name:"whistle"
+ source: "whistle.wav"
}
Sound {
name:"shipengine"
@@ -91,7 +87,7 @@ AudioEngine {
category:"sfx"
PlayVariation {
looping:true
- sample:"fire"
+ sample:"engine"
maxGain:0.9
minGain:0.8
}
@@ -101,23 +97,14 @@ AudioEngine {
name:"effects"
category:"sfx"
PlayVariation {
- sample:"lava"
- maxGain:1.5
- minGain:1.2
- maxPitch:2.0
- minPitch:0.5
+ sample:"horn"
+ maxGain:2.0
+ minGain:0.9
}
PlayVariation {
- sample:"explosion"
- maxGain:1.1
- minGain:0.7
- maxPitch:1.5
- minPitch:0.5
- }
- PlayVariation {
- sample:"water"
- maxGain:1.5
- minGain:1.2
+ sample:"whistle"
+ maxGain:1.0
+ minGain:0.8
}
}
diff --git a/examples/multimedia/audioengine/qml/content/engine-loop.wav b/examples/multimedia/audioengine/qml/content/engine-loop.wav
new file mode 100644
index 000000000..923813694
--- /dev/null
+++ b/examples/multimedia/audioengine/qml/content/engine-loop.wav
Binary files differ
diff --git a/examples/multimedia/audioengine/qml/content/horn.wav b/examples/multimedia/audioengine/qml/content/horn.wav
new file mode 100644
index 000000000..209f2dc52
--- /dev/null
+++ b/examples/multimedia/audioengine/qml/content/horn.wav
Binary files differ
diff --git a/examples/multimedia/audioengine/qml/content/whistle.wav b/examples/multimedia/audioengine/qml/content/whistle.wav
new file mode 100644
index 000000000..f890b791f
--- /dev/null
+++ b/examples/multimedia/audioengine/qml/content/whistle.wav
Binary files differ