[Traverso-commit] traverso/src/audiofileio/decode AbstractAudioRe...

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/09/10 18:41:51

Modified files:
        src/audiofileio/decode: AbstractAudioReader.h PeakDataReader.cpp 

Log message:
        Conversion work from nframes_t to TimeRef

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/AbstractAudioReader.h?cvsroot=traverso&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/traverso/src/audiofileio/decode/PeakDataReader.cpp?cvsroot=traverso&r1=1.1&r2=1.2

Patches:
Index: AbstractAudioReader.h
===================================================================
RCS file: 
/sources/traverso/traverso/src/audiofileio/decode/AbstractAudioReader.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- AbstractAudioReader.h       28 Aug 2007 19:51:51 -0000      1.8
+++ AbstractAudioReader.h       10 Sep 2007 18:41:51 -0000      1.9
@@ -56,6 +56,9 @@
                        destinationBufferSize = size;
                }
                
+               memset(destination[0], 0, destinationBufferSize * 
sizeof(audio_sample_t));
+
+               
                if (readBufferSize < (size*m_channels)) {
                        if (readBuffer) {
                                delete [] readBuffer;

Index: PeakDataReader.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/audiofileio/decode/PeakDataReader.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PeakDataReader.cpp  28 Aug 2007 19:51:51 -0000      1.1
+++ PeakDataReader.cpp  10 Sep 2007 18:41:51 -0000      1.2
@@ -43,7 +43,7 @@
        fseek (m_file, 0, SEEK_END);
        m_channels = 1;
        m_length = ftell (m_file);
-       m_rate = 32000;
+       m_rate = 44100;
        
 }
 
@@ -85,15 +85,15 @@
 {
        Q_ASSERT(m_file);
        
-       int framesRead = fread(buffer->readBuffer, sizeof(peak_data_t), 
frameCount, m_file);
+       int framesRead = fread((void*)buffer->readBuffer, sizeof(peak_data_t), 
frameCount, m_file);
        
-       peak_data_t* readbuffer = (peak_data_t*)buffer->readBuffer;
+       peak_data_t* readbuffer = (peak_data_t*)(buffer->readBuffer);
        
        // De-interlace
        switch (m_channels) {
                case 1:
                        for (int f = 0; f < framesRead; f++) {
-                               buffer->destination[0][f] = 
(float)readbuffer[f];
+                               buffer->destination[0][f] = readbuffer[f];
                        }
                        break;  
                case 2: