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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/12 08:56:27

Modified files:
        src/core       : DiskIO.cpp ReadSource.cpp 

Log message:
        added more error checking

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/DiskIO.cpp?cvsroot=traverso&r1=1.48&r2=1.49
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ReadSource.cpp?cvsroot=traverso&r1=1.71&r2=1.72

Patches:
Index: DiskIO.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/DiskIO.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- DiskIO.cpp  17 Sep 2007 13:40:34 -0000      1.48
+++ DiskIO.cpp  12 Oct 2007 08:56:26 -0000      1.49
@@ -350,8 +350,8 @@
 
        // Wait for the Thread to return from it's event loop. 1000 ms should 
be (more then) enough,
        // if not, terminate this thread and print a warning!
-       if ( ! m_diskThread->wait(1000) ) {
-               qWarning("DiskIO :: Still running after 1 second wait, 
terminating!");
+       if ( ! m_diskThread->wait(2000) ) {
+               qWarning("DiskIO :: Still running after 2 second wait, 
terminating!");
                m_diskThread->terminate();
                res = -1;
        }

Index: ReadSource.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ReadSource.cpp,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -b -r1.71 -r1.72
--- ReadSource.cpp      10 Oct 2007 16:55:23 -0000      1.71
+++ ReadSource.cpp      12 Oct 2007 08:56:27 -0000      1.72
@@ -287,6 +287,7 @@
 int ReadSource::file_read(DecodeBuffer* buffer, const TimeRef& start, 
nframes_t cnt) const
 {
 //     PROFILE_START;
+       Q_ASSERT(m_audioReader);
        nframes_t result = m_audioReader->read_from(buffer, start, cnt);
 //     PROFILE_END("ReadSource::fileread");
        return result;
@@ -295,6 +296,7 @@
 
 int ReadSource::file_read(DecodeBuffer * buffer, nframes_t start, nframes_t 
cnt)
 {
+       Q_ASSERT(m_audioReader);
        return m_audioReader->read_from(buffer, start, cnt);
 }