From: Kurt Korbatits <kurt.korbatits@nokia.com>
Date: Wed, 25 Jul 2012 02:28:23 +0000 (+1000)
Subject: Added check to alsa backend for QAudioOutput
X-Git-Tag: upstream/5.2.95+rc1~240
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=64dbf9d96874a2f6a77b6b525514e0995c358f65;p=platform%2Fupstream%2Fqtmultimedia.git

Added check to alsa backend for QAudioOutput

- Was asserting when stop() called when in IdleState

Change-Id: Ib8a5bd149c0b9c700c709520cf8ffdd237e08694
Reviewed-by: Ling Hu <ling.hu@nokia.com>
Reviewed-by: Kurt Korbatits  <kurt.korbatits@nokia.com>
---

diff --git a/src/multimedia/audio/qaudiooutput_alsa_p.cpp b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
index e80cf15..c9400ba 100644
--- a/src/multimedia/audio/qaudiooutput_alsa_p.cpp
+++ b/src/multimedia/audio/qaudiooutput_alsa_p.cpp
@@ -747,6 +747,11 @@ bool QAudioOutputPrivate::deviceReady()
         if(input > (int)buffer_frames)
             input = buffer_frames;
         l = audioSource->read(audioBuffer,snd_pcm_frames_to_bytes(handle, input));
+
+        // reading can take a while and stream may have been stopped
+        if (!handle)
+            return false;
+
         if(l > 0) {
             // Got some data to output
             if(deviceState != QAudio::ActiveState)