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 <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Stromme <christian.stromme@digia.com>

diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp
index 09f571b..87d7963 100644 (file)
--- a/examples/multimedia/audioinput/audioinput.cpp
+++ b/examples/multimedia/audioinput/audioinput.cpp
@@ -315,20 +315,11 @@ void InputTest::initializeAudio()
 void InputTest::createAudioInput()
 {
     m_audioInput = new QAudioInput(m_device, m_format, this);
-    connect(m_audioInput, SIGNAL(notify()), SLOT(notified()));
-    connect(m_audioInput, SIGNAL(stateChanged(QAudio::State)), SLOT(handleStateChanged(QAudio::State)));
     m_volumeSlider->setValue(m_audioInput->volume() * 100);
     m_audioInfo->start();
     m_audioInput->start(m_audioInfo);
 }
 
-void InputTest::notified()
-{
-    qWarning() << "bytesReady = " << m_audioInput->bytesReady()
-               << ", " << "elapsedUSecs = " <<m_audioInput->elapsedUSecs()
-               << ", " << "processedUSecs = "<<m_audioInput->processedUSecs();
-}
-
 void InputTest::readMore()
 {
     if (!m_audioInput)
@@ -364,27 +355,19 @@ void InputTest::toggleSuspend()
 {
     // toggle suspend/resume
     if (m_audioInput->state() == QAudio::SuspendedState) {
-        qWarning() << "status: Suspended, resume()";
         m_audioInput->resume();
         m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
     } else if (m_audioInput->state() == QAudio::ActiveState) {
-        qWarning() << "status: Active, suspend()";
         m_audioInput->suspend();
         m_suspendResumeButton->setText(tr(RESUME_LABEL));
     } else if (m_audioInput->state() == QAudio::StoppedState) {
-        qWarning() << "status: Stopped, resume()";
         m_audioInput->resume();
         m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
     } else if (m_audioInput->state() == QAudio::IdleState) {
-        qWarning() << "status: IdleState";
+        // no-op
     }
 }
 
-void InputTest::handleStateChanged(QAudio::State state)
-{
-    qWarning() << "state = " << state;
-}
-
 void InputTest::refreshDisplay()
 {
     m_canvas->setLevel(m_audioInfo->level());

diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h
index 82def56..df26104 100644 (file)
--- a/examples/multimedia/audioinput/audioinput.h
+++ b/examples/multimedia/audioinput/audioinput.h
@@ -110,11 +110,9 @@ private:
 
 private slots:
     void refreshDisplay();
-    void notified();
     void readMore();
     void toggleMode();
     void toggleSuspend();
-    void handleStateChanged(QAudio::State state);
     void deviceChanged(int index);
     void sliderChanged(int value);
 

diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp
index daa7bfd..7911b58 100644 (file)
--- a/examples/multimedia/audiooutput/audiooutput.cpp
+++ b/examples/multimedia/audiooutput/audiooutput.cpp
@@ -247,8 +247,6 @@ void AudioTest::createAudioOutput()
     delete m_audioOutput;
     m_audioOutput = 0;
     m_audioOutput = new QAudioOutput(m_device, m_format, this);
-    connect(m_audioOutput, SIGNAL(notify()), SLOT(notified()));
-    connect(m_audioOutput, SIGNAL(stateChanged(QAudio::State)), SLOT(handleStateChanged(QAudio::State)));
     m_generator->start();
     m_audioOutput->start(m_generator);
     m_volumeSlider->setValue(int(m_audioOutput->volume()*100.0f));
@@ -275,13 +273,6 @@ void AudioTest::volumeChanged(int value)
         m_audioOutput->setVolume(qreal(value/100.0f));
 }
 
-void AudioTest::notified()
-{
-    qWarning() << "bytesFree = " << m_audioOutput->bytesFree()
-               << ", " << "elapsedUSecs = " << m_audioOutput->elapsedUSecs()
-               << ", " << "processedUSecs = " << m_audioOutput->processedUSecs();
-}
-
 void AudioTest::pullTimerExpired()
 {
     if (m_audioOutput && m_audioOutput->state() != QAudio::StoppedState) {
@@ -319,23 +310,16 @@ void AudioTest::toggleMode()
 void AudioTest::toggleSuspendResume()
 {
     if (m_audioOutput->state() == QAudio::SuspendedState) {
-        qWarning() << "status: Suspended, resume()";
         m_audioOutput->resume();
         m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
     } else if (m_audioOutput->state() == QAudio::ActiveState) {
-        qWarning() << "status: Active, suspend()";
         m_audioOutput->suspend();
         m_suspendResumeButton->setText(tr(RESUME_LABEL));
     } else if (m_audioOutput->state() == QAudio::StoppedState) {
-        qWarning() << "status: Stopped, resume()";
         m_audioOutput->resume();
         m_suspendResumeButton->setText(tr(SUSPEND_LABEL));
     } else if (m_audioOutput->state() == QAudio::IdleState) {
-        qWarning() << "status: IdleState";
+        // no-op
     }
 }
 
-void AudioTest::handleStateChanged(QAudio::State state)
-{
-    qWarning() << "state = " << state;
-}

diff --git a/examples/multimedia/audiooutput/audiooutput.h b/examples/multimedia/audiooutput/audiooutput.h
index 30cf353..80d6d32 100644 (file)
--- a/examples/multimedia/audiooutput/audiooutput.h
+++ b/examples/multimedia/audiooutput/audiooutput.h
@@ -110,11 +110,9 @@ private:
     QByteArray m_buffer;
 
 private slots:
-    void notified();
     void pullTimerExpired();
     void toggleMode();
     void toggleSuspendResume();
-    void handleStateChanged(QAudio::State state);
     void deviceChanged(int index);
     void volumeChanged(int);
 };

diff --git a/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml b/examples/multimedia/video/qmlvideo/qml/qmlvideo/Content.qml
index 30b1e32..3094c1a 100644 (file)
--- 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 560262d..cb50e36 100644 (file)
--- 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 a65d3e5..c2c1543 100644 (file)
--- 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 5f5066f..714c091 100644 (file)
--- 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 <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)) {

diff --git a/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml b/examples/multimedia/video/qmlvideofx/qml/qmlvideofx/Content.qml
index 0a2a158..19785ce 100644 (file)
--- 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 039e6c3..b724ee3 100644 (file)
--- 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 747ea6b..b165ada 100644 (file)
--- 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()

diff --git a/src/imports/multimedia/qdeclarativeradiodata.cpp b/src/imports/multimedia/qdeclarativeradiodata.cpp
index e867390..6cc829a 100644 (file)
--- a/src/imports/multimedia/qdeclarativeradiodata.cpp
+++ b/src/imports/multimedia/qdeclarativeradiodata.cpp
@@ -281,6 +281,9 @@ void QDeclarativeRadioData::_q_availabilityChanged(QMultimedia::AvailabilityStat
 
 void QDeclarativeRadioData::connectSignals()
 {
+    if (!m_radioData)
+        return;
+
     connect(m_radioData, SIGNAL(programTypeChanged(QRadioData::ProgramType)), this,
                                  SLOT(_q_programTypeChanged(QRadioData::ProgramType)));