From: Kevin Ottens Date: Thu, 30 Aug 2012 13:43:13 +0000 (+0200) Subject: Don't add the beginning of the file to the end of the last period X-Git-Tag: upstream/5.2.95+rc1~178 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2f2b31731814ad93e7e6e56d4815ac85135e719c;p=platform%2Fupstream%2Fqtmultimedia.git Don't add the beginning of the file to the end of the last period If we're in the last loop, it is not necessary to provide a full period on read. Just provide the remaining of the data and hit the end of the stream by returning less than requested, otherwise we potentially generate some garbage noise. Change-Id: I9d3a632ddc0c3289957c9f876d5dbe2999b50ebd Reviewed-by: Thomas McGuire --- diff --git a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp index ef5ff2d..785cdb5 100644 --- a/src/multimedia/audio/qsoundeffect_qaudio_p.cpp +++ b/src/multimedia/audio/qsoundeffect_qaudio_p.cpp @@ -412,6 +412,9 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len) dataOffset += (sampleSize - m_offset); m_offset = 0; + if (m_runningCount > 0 && m_runningCount != QSoundEffect::Infinite) + soundeffect->setLoopsRemaining(m_runningCount-1); + if (m_runningCount > 0 || m_runningCount == QSoundEffect::Infinite) { // There are still more loops of this sound to play, append the start of sound to make up full period memcpy(data + dataOffset, sampleData + m_offset, wrapLen); @@ -423,8 +426,6 @@ qint64 PrivateSoundSource::readData( char* data, qint64 len) << ", part2=" << wrapLen; qDebug() << "part1 + part2 should be a period " << periodSize; #endif - if (m_runningCount != QSoundEffect::Infinite) - soundeffect->setLoopsRemaining(m_runningCount-1); } } if (m_runningCount == 0)