From c22299dd388af117e436c17258d7afc1623af9b6 Mon Sep 17 00:00:00 2001 From: Gareth Stockwell Date: Tue, 16 Feb 2010 17:41:25 +0000 Subject: Changed function names in audio input example to clarify meaning Reviewed-by: trustme --- examples/multimedia/audioinput/audioinput.cpp | 9 +++++---- examples/multimedia/audioinput/audioinput.h | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/examples/multimedia/audioinput/audioinput.cpp b/examples/multimedia/audioinput/audioinput.cpp index 2258854..8a97640 100644 --- a/examples/multimedia/audioinput/audioinput.cpp +++ b/examples/multimedia/audioinput/audioinput.cpp @@ -279,14 +279,15 @@ void InputTest::initializeAudio() void InputTest::createAudioInput() { + m_audioInput = new QAudioInput(m_device, m_format, this); - connect(m_audioInput, SIGNAL(notify()), SLOT(status())); - connect(m_audioInput, SIGNAL(stateChanged(QAudio::State)), SLOT(state(QAudio::State))); + connect(m_audioInput, SIGNAL(notify()), SLOT(notified())); + connect(m_audioInput, SIGNAL(stateChanged(QAudio::State)), SLOT(stateChanged(QAudio::State))); m_audioInfo->start(); m_audioInput->start(m_audioInfo); } -void InputTest::status() +void InputTest::notified() { qWarning() << "bytesReady = " << m_audioInput->bytesReady() << ", " << "elapsedUSecs = " <elapsedUSecs() @@ -345,7 +346,7 @@ void InputTest::toggleSuspend() } } -void InputTest::state(QAudio::State state) +void InputTest::stateChanged(QAudio::State state) { qWarning() << "state = " << state; } diff --git a/examples/multimedia/audioinput/audioinput.h b/examples/multimedia/audioinput/audioinput.h index f1ab254..f87c682 100644 --- a/examples/multimedia/audioinput/audioinput.h +++ b/examples/multimedia/audioinput/audioinput.h @@ -105,11 +105,11 @@ private: private slots: void refreshDisplay(); - void status(); + void notified(); void readMore(); void toggleMode(); void toggleSuspend(); - void state(QAudio::State state); + void stateChanged(QAudio::State state); void deviceChanged(int index); private: -- cgit v0.12