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

Make the multimedia examples less verbose

Browse Source 
Important warnings such as missing services are still printed though.

Task-number: QTBUG-31080
Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>
This commit is contained in:
Alex Blasche
2014-09-18 11:33:46 +02:00
parent da383e5c7e
commit f788f8e5c6
12 changed files with 5 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
View File

@@ -97,21 +97,16 @@ Rectangle {
}
function initialize() {
console.log("[qmlvideo] Content.initialize: contentType " + contentType)
if ("video" == contentType) {
console.log("[qmlvideo] Content.initialize: loading VideoItem.qml")
contentLoader.source = "VideoItem.qml"
if (Loader.Error == contentLoader.status) {
console.log("[qmlvideo] Content.initialize: loading VideoDummy.qml")
contentLoader.source = "VideoDummy.qml"
dummy = true
}
contentLoader.item.volume = volume
} else if ("camera" == contentType) {
console.log("[qmlvideo] Content.initialize: loading CameraItem.qml")
contentLoader.source = "CameraItem.qml"
if (Loader.Error == contentLoader.status) {
console.log("[qmlvideo] Content.initialize: loading CameraDummy.qml")
contentLoader.source = "CameraDummy.qml"
dummy = true
}
@@ -127,12 +122,10 @@ Rectangle {
if (root.autoStart)
root.start()
}
console.log("[qmlvideo] Content.initialize: complete")
root.initialized()
}
function start() {
console.log("[qmlvideo] Content.start")
if (contentLoader.item) {
if (root.contentType == "video")
contentLoader.item.mediaSource = root.source
@@ -142,7 +135,6 @@ Rectangle {
}
function stop() {
console.log("[qmlvideo] Content.stop")
if (contentLoader.item) {
contentLoader.item.stop()
if (root.contentType == "video")

1
examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml
View File

@@ -67,7 +67,6 @@ Scene {
MouseArea {
anchors.fill: parent
onClicked: {
console.log("[qmlvideo] SceneBasic.onClicked, started = " + content.started)
if (content.started)
content.stop()
else

3
examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml
View File

@@ -65,7 +65,6 @@ Rectangle {
}
function init() {
console.log("[qmlvideo] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible)
var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible
source = enabled ? "../performancemonitor/PerformanceItem.qml" : ""
}
@@ -137,7 +136,6 @@ Rectangle {
}
radius: 10
onSceneSourceChanged: {
console.log("[qmlvideo] main.onSceneSourceChanged source " + sceneSource)
sceneLoader.source = sceneSource
var scene = null
var innerVisible = true
@@ -224,7 +222,6 @@ Rectangle {
}
function closeScene() {
console.log("[qmlvideo] main.closeScene")
sceneSelectionPanel.sceneSource = ""
}
}