[Traverso-commit] traverso/src/core ReadSource.cpp

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/17 15:13:43

Modified files:
        src/core       : ReadSource.cpp 

Log message:
        * don't try to read in more samples then there are available. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.76&r2=1.77

Patches:
Index: ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- ReadSource.cpp      17 Oct 2007 08:22:30 -0000      1.76
+++ ReadSource.cpp      17 Oct 2007 15:13:43 -0000      1.77
@@ -411,7 +411,12 @@
 
 int ReadSource::rb_file_read(DecodeBuffer* buffer, nframes_t cnt)
 {
-       int readFrames = file_read(buffer, m_rbFileReadPos, cnt);
+       TimeRef range(cnt, m_outputRate);
+       if ( (m_rbFileReadPos + range) > m_length) {
+               cnt = (m_length - m_rbFileReadPos).to_frame(m_outputRate);
+       }
+       
+       nframes_t readFrames = file_read(buffer, m_rbFileReadPos, cnt);
        if (readFrames == cnt) {
                m_rbFileReadPos.add_frames(readFrames, m_outputRate);
        } else {