Fix QAudioInput to connect to correct slot on Symbian

Symbian backend for QAudioInput tried to connect to a non-existent
signal, instead it should have connected to notifyTimerExpired slot.

Audioinput example updated also.

Task-number: QTMOBILITY-1736
Reviewed-by: Juha Kukkonen

5 files changed, 17 insertions, 3 deletions

diff --git a/examples/audioinput/audioinput.cpp b/examples/audioinput/audioinput.cpp
index aa008df1aa..fba6dcd091 100644
--- a/examples/audioinput/audioinput.cpp
+++ b/examples/audioinput/audioinput.cpp
@@ -56,6 +56,7 @@ const QString InputTest::PushModeLabel(tr("Enable push mode"));
 const QString InputTest::PullModeLabel(tr("Enable pull mode"));
 const QString InputTest::SuspendLabel(tr("Suspend recording"));
 const QString InputTest::ResumeLabel(tr("Resume recording"));
+const QString InputTest::StoppedLabel(tr("Recording stopped"));
 
 const int BufferSize = 4096;
 
@@ -338,7 +339,10 @@ void InputTest::toggleSuspend()
     } else if (m_audioInput->state() == QAudio::StoppedState) {
         qWarning() << "status: Stopped, resume()";
         m_audioInput->resume();
-        m_suspendResumeButton->setText(SuspendLabel);
+        if (m_audioInput->state() == QAudio::ActiveState)
+           m_suspendResumeButton->setText(SuspendLabel);
+        else
+            m_suspendResumeButton->setText(StoppedLabel);
     } else if (m_audioInput->state() == QAudio::IdleState) {
         qWarning() << "status: IdleState";
     }
@@ -347,6 +351,9 @@ void InputTest::toggleSuspend()
 void InputTest::stateChanged(QAudio::State state)
 {
     qWarning() << "state = " << state;
+
+    if(state == QAudio::StoppedState)
+       m_suspendResumeButton->setText(StoppedLabel);
 }
 
 void InputTest::refreshDisplay()
diff --git a/examples/audioinput/audioinput.h b/examples/audioinput/audioinput.h
index 540e798453..58b75e3a18 100644
--- a/examples/audioinput/audioinput.h
+++ b/examples/audioinput/audioinput.h
@@ -133,6 +133,7 @@ private:
     static const QString PullModeLabel;
     static const QString SuspendLabel;
     static const QString ResumeLabel;
+    static const QString StoppedLabel;
 };
 
 #endif
diff --git a/examples/audioinput/audioinput.pro b/examples/audioinput/audioinput.pro
index 80daa8d656..23dedc0367 100644
--- a/examples/audioinput/audioinput.pro
+++ b/examples/audioinput/audioinput.pro
@@ -13,4 +13,6 @@ HEADERS       = audioinput.h
 
 SOURCES       = audioinput.cpp \
                 main.cpp
-
+symbian: {
+TARGET.CAPABILITY = UserEnvironment
+}
diff --git a/examples/audioinput/main.cpp b/examples/audioinput/main.cpp
index c14d1c8433..fffb898f10 100644
--- a/examples/audioinput/main.cpp
+++ b/examples/audioinput/main.cpp
@@ -48,7 +48,11 @@ int main(int argv, char **args)
     app.setApplicationName("Audio Input Test");
 
     InputTest input;
+#ifndef Q_WS_S60
     input.show();
+#else
+    input.showMaximized();
+#endif
 
     return app.exec();
 }
diff --git a/src/multimedia/audio/qaudioinput_symbian_p.cpp b/src/multimedia/audio/qaudioinput_symbian_p.cpp
index fe250cf322..03bfeab9ee 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudioinput_symbian_p.cpp
@@ -125,7 +125,7 @@ QAudioInputPrivate::QAudioInputPrivate(const QByteArray &device)
     qRegisterMetaType<CMMFBuffer *>("CMMFBuffer *");
 
     connect(m_notifyTimer.data(), SIGNAL(timeout()),
-            this, SIGNAL(notifyTimerExpired()));
+            this, SLOT(notifyTimerExpired()));
 
     m_pullTimer->setInterval(PushInterval);
     connect(m_pullTimer.data(), SIGNAL(timeout()), this, SLOT(pullData()));