diff options
| author | Alex Blasche <alexander.blasche@digia.com> | 2014-09-18 11:33:46 +0200 |
|---|---|---|
| committer | Alex Blasche <alexander.blasche@digia.com> | 2014-09-22 11:11:10 +0200 |
| commit | f788f8e5c65a3d07a64d1507cc21714292dc6efd (patch) | |
| tree | 176c73c081583b4e6cc1dd31324612f781a875c5 /examples/multimedia/audiooutput | |
| parent | da383e5c7e3cbf94c054a9418a8b53ab4619bb83 (diff) | |
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>
Diffstat (limited to 'examples/multimedia/audiooutput')
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.cpp | 18 | ||||
| -rw-r--r-- | examples/multimedia/audiooutput/audiooutput.h | 2 |
2 files changed, 1 insertions, 19 deletions
diff --git a/examples/multimedia/audiooutput/audiooutput.cpp b/examples/multimedia/audiooutput/audiooutput.cpp index daa7bfdf6..7911b580a 100644 --- 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 30cf35369..80d6d3279 100644 --- 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); }; |