1 files changed, 23 insertions, 14 deletions

diff --git a/src/multimedia/audio/qaudioinput_symbian_p.cpp b/src/multimedia/audio/qaudioinput_symbian_p.cpp
index 9d240cad30..485c69507a 100644
--- a/src/multimedia/audio/qaudioinput_symbian_p.cpp
+++ b/src/multimedia/audio/qaudioinput_symbian_p.cpp
@@ -174,23 +174,30 @@ void QAudioInputPrivate::suspend()
         || SymbianAudio::IdleState == m_internalState) {
         m_notifyTimer->stop();
         m_pullTimer->stop();
-        m_devSound->pause();
         const qint64 samplesRecorded = getSamplesRecorded();
         m_totalSamplesRecorded += samplesRecorded;
 
-        if (m_devSoundBuffer) {
-            m_devSoundBufferQ.append(m_devSoundBuffer);
+        const bool paused = m_devSound->pause();
+        if (paused) {
+            if (m_devSoundBuffer)
+                m_devSoundBufferQ.append(m_devSoundBuffer);
             m_devSoundBuffer = 0;
+            setState(SymbianAudio::SuspendedPausedState);
+        } else {
+            m_devSoundBuffer = 0;
+            m_devSoundBufferQ.clear();
+            m_devSoundBufferPos = 0;
+            setState(SymbianAudio::SuspendedStoppedState);
         }
-
-        setState(SymbianAudio::SuspendedState);
     }
 }
 
 void QAudioInputPrivate::resume()
 {
-    if (SymbianAudio::SuspendedState == m_internalState) {
-        if (!m_pullMode && !bytesReady())
+    if (QAudio::SuspendedState == m_externalState) {
+        if (SymbianAudio::SuspendedPausedState == m_internalState)
+            m_devSound->resume();
+        else
             m_devSound->start();
         startDataTransfer();
     }
@@ -246,7 +253,7 @@ int QAudioInputPrivate::notifyInterval() const
 qint64 QAudioInputPrivate::processedUSecs() const
 {
     int samplesPlayed = 0;
-    if (m_devSound && SymbianAudio::SuspendedState != m_internalState)
+    if (m_devSound && QAudio::SuspendedState != m_externalState)
         samplesPlayed = getSamplesRecorded();
 
     // Protect against division by zero
@@ -335,7 +342,7 @@ void QAudioInputPrivate::startDataTransfer()
         if (!m_pullMode)
             pushData();
     } else {
-        if (SymbianAudio::SuspendedState == m_internalState)
+        if (QAudio::SuspendedState == m_externalState)
             setState(SymbianAudio::ActiveState);
         else
             setState(SymbianAudio::IdleState);
@@ -373,7 +380,8 @@ qint64 QAudioInputPrivate::read(char *data, qint64 len)
 
         TDesC8 &inputBuffer = buffer->Data();
 
-        const qint64 inputBytes = bytesReady();
+        Q_ASSERT(inputBuffer.Length() >= m_devSoundBufferPos);
+        const qint64 inputBytes = inputBuffer.Length() - m_devSoundBufferPos;
         const qint64 outputBytes = len - bytesRead;
         const qint64 copyBytes = outputBytes < inputBytes ?
                                      outputBytes : inputBytes;
@@ -384,7 +392,7 @@ qint64 QAudioInputPrivate::read(char *data, qint64 len)
         data += copyBytes;
         bytesRead += copyBytes;
 
-        if (!bytesReady())
+        if (inputBytes == copyBytes)
             bufferEmptied();
     }
 
@@ -403,13 +411,14 @@ void QAudioInputPrivate::pullData()
 
         TDesC8 &inputBuffer = buffer->Data();
 
-        const qint64 inputBytes = bytesReady();
+        Q_ASSERT(inputBuffer.Length() >= m_devSoundBufferPos);
+        const qint64 inputBytes = inputBuffer.Length() - m_devSoundBufferPos;
         const qint64 bytesPushed = m_sink->write(
             (char*)inputBuffer.Ptr() + m_devSoundBufferPos, inputBytes);
 
         m_devSoundBufferPos += bytesPushed;
 
-        if (!bytesReady())
+        if (inputBytes == bytesPushed)
             bufferEmptied();
 
         if (!bytesPushed)
@@ -441,7 +450,7 @@ void QAudioInputPrivate::devsoundBufferToBeEmptied(CMMFBuffer *baseBuffer)
 
     m_totalBytesReady += buffer->Data().Length();
 
-    if (SymbianAudio::SuspendedState == m_internalState) {
+    if (SymbianAudio::SuspendedPausedState == m_internalState) {
         m_devSoundBufferQ.append(buffer);
     } else {
         // Will be returned to DevSoundWrapper by bufferProcessed().