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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/07/25 17:06:16

Modified files:
        src/core       : AbstractAudioReader.cpp AbstractAudioReader.h 
                         FlacAudioReader.cpp MadAudioReader.cpp 
                         ResampleAudioReader.cpp SFAudioReader.cpp 
                         VorbisAudioReader.cpp WPAudioReader.cpp 

Log message:
        - remove last traverso dependencies from the AudioReaders
        - remove mutex from AudioReaders, since now only one thread ever uses 
any given 
          ReadSource and its AudioReader

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AbstractAudioReader.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/AbstractAudioReader.h?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/FlacAudioReader.cpp?cvsroot=traverso&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/MadAudioReader.cpp?cvsroot=traverso&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/ResampleAudioReader.cpp?cvsroot=traverso&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/SFAudioReader.cpp?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/VorbisAudioReader.cpp?cvsroot=traverso&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/WPAudioReader.cpp?cvsroot=traverso&r1=1.5&r2=1.6

Patches:
Index: AbstractAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/AbstractAudioReader.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- AbstractAudioReader.cpp     24 Jul 2007 17:57:05 -0000      1.14
+++ AbstractAudioReader.cpp     25 Jul 2007 17:06:16 -0000      1.15
@@ -28,7 +28,6 @@
 #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!
@@ -52,8 +51,6 @@
 // uses seek() and read() from AudioReader subclass
 nframes_t AbstractAudioReader::read_from(audio_sample_t** buffer, nframes_t 
start, nframes_t count)
 {
-       QMutexLocker locker( &m_mutex );
-       
 //     printf("read_from:: before_seek from %d, framepos is %d\n", start, 
m_readPos);
        
        if (!seek(start)) {

Index: AbstractAudioReader.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/AbstractAudioReader.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- AbstractAudioReader.h       24 Jul 2007 17:57:05 -0000      1.12
+++ AbstractAudioReader.h       25 Jul 2007 17:06:16 -0000      1.13
@@ -23,7 +23,6 @@
 #define ABSTRACTAUDIOREADER_H
 
 #include <QObject>
-#include <QMutex>
 
 #include "defines.h"
 
@@ -54,7 +53,6 @@
        virtual nframes_t read_private(audio_sample_t** buffer, nframes_t 
frameCount) = 0;
        
        QString         m_fileName;
-       QMutex          m_mutex;
 
        nframes_t       m_readPos;
        nframes_t       m_channels;

Index: FlacAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/FlacAudioReader.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- FlacAudioReader.cpp 25 Jul 2007 00:52:31 -0000      1.12
+++ FlacAudioReader.cpp 25 Jul 2007 17:06:16 -0000      1.13
@@ -27,7 +27,6 @@
 #include "FlacAudioReader.h"
 #include <QFile>
 #include <QString>
-#include "Utils.h"
 
 #include "FLAC/export.h"
 
@@ -384,7 +383,7 @@
        QFile f(filename);
 
        if (!f.open(QIODevice::ReadOnly)) {
-               PERROR("Could not open file %s", QS_C(filename));
+               PERROR("Could not open file %s", filename.toUtf8().data());
                return false;
        }
 
@@ -441,7 +440,7 @@
        Q_ASSERT(m_flac);
        
        if (start >= get_length()) {
-               PERROR("FlacAudioReader: could not seek to frame %d within %s, 
it's past the end.", start, QS_C(m_fileName));
+               PERROR("FlacAudioReader: could not seek to frame %d within %s, 
it's past the end.", start, m_fileName.toUtf8().data());
                return false;
        }
        
@@ -451,7 +450,7 @@
        m_flac->flush();
        
        if (!m_flac->seek(start)) {
-               PERROR("FlacAudioReader: could not seek to frame %d within %s", 
start, QS_C(m_fileName));
+               PERROR("FlacAudioReader: could not seek to frame %d within %s", 
start, m_fileName.toUtf8().data());
                return false;
        }
        

Index: MadAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/MadAudioReader.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- MadAudioReader.cpp  25 Jul 2007 06:29:43 -0000      1.15
+++ MadAudioReader.cpp  25 Jul 2007 17:06:16 -0000      1.16
@@ -25,7 +25,6 @@
 #include <QFile>
 #include <QString>
 #include <QVector>
-#include "Utils.h"
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -143,7 +142,7 @@
        m_inputFile.setFileName(filename);
        
        if (!m_inputFile.open(QIODevice::ReadOnly)) {
-               PERROR("could not open file %s", QS_C(m_inputFile.fileName()));
+               PERROR("could not open file %s", 
m_inputFile.fileName().toUtf8().data());
                return false;
        }
        
@@ -251,7 +250,7 @@
                
                // skip the id3 tag
                if (!m_inputFile.seek(offset)) {
-                       PERROR("Couldn't seek to %u in %s", offset, 
QS_C(m_inputFile.fileName()));
+                       PERROR("Couldn't seek to %u in %s", offset, 
m_inputFile.fileName().toUtf8().data());
                        return false;
                }
        }

Index: ResampleAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/ResampleAudioReader.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- ResampleAudioReader.cpp     24 Jul 2007 17:57:06 -0000      1.14
+++ ResampleAudioReader.cpp     25 Jul 2007 17:06:16 -0000      1.15
@@ -21,7 +21,6 @@
 
 #include "ResampleAudioReader.h"
 #include <QString>
-#include "Utils.h"
 
 #define OVERFLOW_SIZE 1024
 

Index: SFAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/SFAudioReader.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SFAudioReader.cpp   24 Jul 2007 17:57:06 -0000      1.8
+++ SFAudioReader.cpp   25 Jul 2007 17:06:16 -0000      1.9
@@ -22,7 +22,6 @@
 #include "SFAudioReader.h"
 #include <QFile>
 #include <QString>
-#include "Utils.h"
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -38,8 +37,8 @@
        */
        memset (&m_sfinfo, 0, sizeof(m_sfinfo));
 
-       if ((m_sf = sf_open ((m_fileName.toUtf8().data()), SFM_READ, 
&m_sfinfo)) == 0) {
-               PERROR("Couldn't open soundfile (%s)", QS_C(m_fileName));
+       if ((m_sf = sf_open (m_fileName.toUtf8().data(), SFM_READ, &m_sfinfo)) 
== 0) {
+               PERROR("Couldn't open soundfile (%s)", 
m_fileName.toUtf8().data());
        }
        
        m_channels = m_sfinfo.channels;
@@ -100,7 +99,7 @@
        if (sf_seek (m_sf, (off_t) start, SEEK_SET) < 0) {
                char errbuf[256];
                sf_error_str (0, errbuf, sizeof (errbuf) - 1);
-               PERROR("ReadAudioSource: could not seek to frame %d within %s 
(%s)", start, QS_C(m_fileName), errbuf);
+               PERROR("ReadAudioSource: could not seek to frame %d within %s 
(%s)", start, m_fileName.toUtf8().data(), errbuf);
                return false;
        }
        

Index: VorbisAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/VorbisAudioReader.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- VorbisAudioReader.cpp       24 Jul 2007 17:57:06 -0000      1.10
+++ VorbisAudioReader.cpp       25 Jul 2007 17:06:16 -0000      1.11
@@ -22,7 +22,6 @@
 #include "VorbisAudioReader.h"
 #include <QFile>
 #include <QString>
-#include "Utils.h"
 
 #ifdef _WIN32
 #include <io.h>
@@ -39,7 +38,7 @@
 {
        m_file = fopen(filename.toUtf8().data(), "rb");
        if (!m_file) {
-               PERROR("Couldn't open file %s.", QS_C(filename));
+               PERROR("Couldn't open file %s.", filename.toUtf8().data());
                return;
        }
        
@@ -70,7 +69,7 @@
 {
        FILE* file = fopen(filename.toUtf8().data(), "rb");
        if (!file) {
-               PERROR("Could not open file: %s.", QS_C(filename));
+               PERROR("Could not open file: %s.", filename.toUtf8().data());
                return false;
        }
        
@@ -96,7 +95,7 @@
        }
        
        if (int result = ov_pcm_seek(&m_vf, start) < 0) {
-               PERROR("VorbisAudioReader: could not seek to frame %d within %s 
(%d)", start, QS_C(m_fileName), result);
+               PERROR("VorbisAudioReader: could not seek to frame %d within %s 
(%d)", start, m_fileName.toUtf8().data(), result);
                return false;
        }
        

Index: WPAudioReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/WPAudioReader.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- WPAudioReader.cpp   24 Jul 2007 17:57:06 -0000      1.5
+++ WPAudioReader.cpp   25 Jul 2007 17:06:16 -0000      1.6
@@ -21,7 +21,6 @@
 
 #include "WPAudioReader.h"
 #include <QString>
-#include "Utils.h"
 
 // Always put me below _all_ includes, this is needed
 // in case we run with memory leak detection enabled!
@@ -36,7 +35,7 @@
        m_wp = WavpackOpenFileInput(m_fileName.toUtf8().data(), error, 
OPEN_2CH_MAX, 1);
        
        if (m_wp == 0) {
-               PERROR("Couldn't open soundfile (%s) %s", QS_C(m_fileName), 
error);
+               PERROR("Couldn't open soundfile (%s) %s", 
filename.toUtf8().data(), error);
        }
        
        m_isFloat = ((WavpackGetMode(m_wp) & MODE_FLOAT) != 0);
@@ -88,7 +87,7 @@
        }
        
        if (!WavpackSeekSample(m_wp, start)) {
-               PERROR("could not seek to frame %d within %s", start, 
QS_C(m_fileName));
+               PERROR("could not seek to frame %d within %s", start, 
m_fileName.toUtf8().data());
                return false;
        }