slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/5.4' into 5.5

Browse Source 
Conflicts:
	src/multimedia/playback/playlistfileparser.cpp
	src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp

Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
This commit is contained in:
Liang Qi
2015-04-15 09:26:14 +02:00
parent 6187b72c51 f9145aca16
commit 1925bb404e
40 changed files with 871 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
examples/multimedia/audioengine/qml/audioengine.qml
View File

@@ -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"