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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/07/09 20:38:53

Modified files:
        src/core       : AbstractAudioReader.cpp 

Log message:
        Fix to my temp fix.  Much cleaner (and more correct) now.  (Thanks 
Remon)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AbstractAudioReader.cpp?cvsroot=traverso&r1=1.3&r2=1.4

Patches:
Index: AbstractAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AbstractAudioReader.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AbstractAudioReader.cpp     9 Jul 2007 20:24:21 -0000       1.3
+++ AbstractAudioReader.cpp     9 Jul 2007 20:38:53 -0000       1.4
@@ -26,6 +26,7 @@
 #include "ResampleAudioReader.h"
 
 #include <QString>
+#include <QMutexLocker>
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -49,7 +50,7 @@
 // uses seek() and read() from AudioReader subclass
 int AbstractAudioReader::read_from(audio_sample_t* dst, nframes_t start, 
nframes_t cnt)
 {
-       m_mutex.lock();
+       QMutexLocker locker( &m_mutex );
        
        if (m_nextFrame != start) {
                if (!seek(start)) {
@@ -59,7 +60,6 @@
        
        int samplesRead = read(dst, cnt);
        
-       m_mutex.unlock();
        return samplesRead;
 }