[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/4.1/kdebase/runtime/phonon/xine
From:       Matthias Kretz <kretz () kde ! org>
Date:       2008-07-18 19:12:10
Message-ID: 1216408330.477274.22432.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 834385 by mkretz:

backport: pullBuffer modifies m_buffersize, so m_currentPosition was not adjusted correctly


 M  +3 -2      bytestream.cpp  


--- branches/KDE/4.1/kdebase/runtime/phonon/xine/bytestream.cpp #834384:834385
@@ -223,8 +223,9 @@
     Q_ASSERT(m_eod);
     if (m_buffersize > 0) {
         PXINE_VDEBUG << "calling pullBuffer with m_buffersize = " << m_buffersize;
-        pullBuffer(static_cast<char *>(buf), m_buffersize);
-        m_currentPosition += m_buffersize;
+        const int len = m_buffersize;
+        pullBuffer(static_cast<char *>(buf), len);
+        m_currentPosition += len;
         PXINE_DEBUG << "returning less data than requested, the stream is at its end";
         //kDebug(610) << "UNLOCKING m_mutex: ";
         return m_buffersize;
[prev in list] [next in list] [prev in thread] [next in thread]