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

2
examples/multimedia/video/qmlvideofx/filereader.cpp
View File

@@ -32,7 +32,6 @@
****************************************************************************/
#include "filereader.h"
#include "trace.h"
#include <QCoreApplication>
#include <QDir>
@@ -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)) {

7
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
View File

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

6
examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Main.qml
View File

@@ -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()