summaryrefslogtreecommitdiffstats
path: root/examples/multimedia
diff options
context:
space:
mode:
Diffstat (limited to 'examples/multimedia')
-rw-r--r--examples/multimedia/declarative-camera/VideoPreview.qml2
-rw-r--r--examples/multimedia/video/mediaplayer/main.qml3
-rw-r--r--examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml3
-rw-r--r--examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml6
4 files changed, 13 insertions, 1 deletions
diff --git a/examples/multimedia/declarative-camera/VideoPreview.qml b/examples/multimedia/declarative-camera/VideoPreview.qml
index 5a2f90829..f47bfd009 100644
--- a/examples/multimedia/declarative-camera/VideoPreview.qml
+++ b/examples/multimedia/declarative-camera/VideoPreview.qml
@@ -67,6 +67,8 @@ Item {
}
videoOutput: output
+ audioOutput: AudioOutput {
+ }
}
VideoOutput {
diff --git a/examples/multimedia/video/mediaplayer/main.qml b/examples/multimedia/video/mediaplayer/main.qml
index 05946474b..e88117112 100644
--- a/examples/multimedia/video/mediaplayer/main.qml
+++ b/examples/multimedia/video/mediaplayer/main.qml
@@ -73,6 +73,9 @@ Window {
MediaPlayer {
id: mediaPlayer
videoOutput: videoOutput
+ audioOutput: AudioOutput {
+ }
+
onErrorOccurred: { mediaErrorText.text = mediaPlayer.errorString; mediaError.open() }
onMetaDataChanged: { metadataInfo.read(mediaPlayer.metaData) }
}
diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
index a7d4ef2f4..c6159a9af 100644
--- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
+++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/VideoItem.qml
@@ -70,6 +70,9 @@ VideoOutput {
MediaPlayer {
id: mediaPlayer
videoOutput: root;
+ audioOutput: AudioOutput {
+
+ }
onErrorOccurred: function(error, errorString) {
if (MediaPlayer.NoError !== error) {
diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
index ae57cee75..13872c959 100644
--- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
+++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/ContentVideo.qml
@@ -52,7 +52,7 @@ import QtQuick
import QtMultimedia
VideoOutput {
- source: mediaPlayer
+ id: video
property alias mediaSource: mediaPlayer.source
property alias volume: mediaPlayer.volume
property bool isRunning: true
@@ -62,6 +62,10 @@ VideoOutput {
autoPlay: true
volume: 0.5
loops: Audio.Infinite
+ videoOutput: video
+ audioOutput: AudioOutput {
+
+ }
}
function play() { mediaPlayer.play() }