From f788f8e5c65a3d07a64d1507cc21714292dc6efd Mon Sep 17 00:00:00 2001 From: Alex Blasche Date: Thu, 18 Sep 2014 11:33:46 +0200 Subject: Make the multimedia examples less verbose Important warnings such as missing services are still printed though. Task-number: QTBUG-31080 Change-Id: I96fd3837c4edc58c61b97bf950b7cab05ceed014 Reviewed-by: Friedemann Kleint Reviewed-by: Christian Stromme --- examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml | 8 -------- examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml | 1 - examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml | 3 --- examples/multimedia/video/qmlvideofx/filereader.cpp | 2 -- examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml | 7 ------- examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml | 6 ------ .../video/snippets/frequencymonitor/frequencymonitor.cpp | 2 -- 7 files changed, 29 deletions(-) (limited to 'examples/multimedia/video') diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml index 30b1e32b8..3094c1a3b 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml @@ -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") diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml index 560262db2..cb50e3653 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/SceneBasic.qml @@ -67,7 +67,6 @@ Scene { MouseArea { anchors.fill: parent onClicked: { - console.log("[qmlvideo] SceneBasic.onClicked, started = " + content.started) if (content.started) content.stop() else diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml index a65d3e552..c2c15439f 100644 --- a/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml +++ b/examples/multimedia/video/qmlvideo/qml/qmlvideo/main.qml @@ -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 = "" } } diff --git a/examples/multimedia/video/qmlvideofx/filereader.cpp b/examples/multimedia/video/qmlvideofx/filereader.cpp index 5f5066f12..714c0914d 100644 --- a/examples/multimedia/video/qmlvideofx/filereader.cpp +++ b/examples/multimedia/video/qmlvideofx/filereader.cpp @@ -32,7 +32,6 @@ ****************************************************************************/ #include "filereader.h" -#include "trace.h" #include #include @@ -42,7 +41,6 @@ QString FileReader::readFile(const QString &fileName) { - qtTrace() << "FileReader::readFile" << "fileName" << fileName; QString content; QFile file(fileName); if (file.open(QIODevice::ReadOnly)) { diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml index 0a2a1584f..19785ce86 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml @@ -84,7 +84,6 @@ Rectangle { } onEffectSourceChanged: { - console.log("[qmlvideofx] Content.onEffectSourceChanged " + effectSource) effectLoader.source = effectSource effectLoader.item.parent = root effectLoader.item.targetWidth = root.width @@ -96,7 +95,6 @@ Rectangle { } function init() { - console.log("[qmlvideofx] Content.init") openImage("qrc:/images/qt-logo.png") root.effectSource = "EffectPassThrough.qml" } @@ -107,7 +105,6 @@ Rectangle { } function updateSource() { - console.log("[qmlvideofx] Content.updateSource") if (contentLoader.item) { contentLoader.item.parent = root contentLoader.item.anchors.fill = root @@ -118,7 +115,6 @@ Rectangle { } function openImage(path) { - console.log("[qmlvideofx] Content.openImage \"" + path + "\"") stop() contentLoader.source = "ContentImage.qml" videoFramePaintedConnection.target = null @@ -127,7 +123,6 @@ Rectangle { } function openVideo(path) { - console.log("[qmlvideofx] Content.openVideo \"" + path + "\"") stop() contentLoader.source = "ContentVideo.qml" videoFramePaintedConnection.target = contentLoader.item @@ -138,7 +133,6 @@ Rectangle { } function openCamera() { - console.log("[qmlvideofx] Content.openCamera") stop() contentLoader.source = "ContentCamera.qml" videoFramePaintedConnection.target = contentLoader.item @@ -146,7 +140,6 @@ Rectangle { } function stop() { - console.log("[qmlvideofx] Content.stop") if (contentLoader.source == "ContentVideo.qml") contentLoader.item.stop() theSource.sourceItem = null diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml index 039e6c36f..b724ee3bd 100644 --- a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml +++ b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml @@ -160,7 +160,6 @@ Rectangle { Loader { id: performanceLoader function init() { - console.log("[qmlvideofx] performanceLoader.init logging " + root.perfMonitorsLogging + " visible " + root.perfMonitorsVisible) var enabled = root.perfMonitorsLogging || root.perfMonitorsVisible source = enabled ? "../performancemonitor/PerformanceItem.qml" : "" } @@ -249,11 +248,6 @@ Rectangle { height = windowHeight width = windowWidth - console.log("[qmlvideofx] root.init") - console.log("Height: ", Screen.desktopAvailableHeight) - console.log("Width: ", Screen.desktopAvailableWidth) - console.log("Pixels per mm: ", Math.ceil(Screen.pixelDensity)) - console.log("Orientation: ", Screen.orientation) imageFileBrowser.folder = imagePath videoFileBrowser.folder = videoPath content.init() diff --git a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp index 747ea6bdf..b165adada 100644 --- a/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp +++ b/examples/multimedia/video/snippets/frequencymonitor/frequencymonitor.cpp @@ -125,7 +125,6 @@ void FrequencyMonitorPrivate::calculateAverageFrequency() void FrequencyMonitorPrivate::stalled() { if (m_instantaneousFrequency) { - qtVerboseTrace() << "FrequencyMonitor::stalled"; m_instantaneousFrequency = 0; emit q_ptr->instantaneousFrequencyChanged(m_instantaneousFrequency); emit q_ptr->frequencyChanged(); @@ -136,7 +135,6 @@ FrequencyMonitor::FrequencyMonitor(QObject *parent) : QObject(parent) { d_ptr = new FrequencyMonitorPrivate(this); - qtTrace() << "FrequencyMonitor::FrequencyMonitor"; } FrequencyMonitor::~FrequencyMonitor() -- cgit v1.2.3