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

[Remon Sijrier]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Remon Sijrier <r_sijrier>       07/10/29 13:25:31

Modified files:
        src/core       : Peak.cpp 

Log message:
        * peak Normalized values start offset was calculated wrongly due change 
in peak_data_t type. 

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.73&r2=1.74

Patches:
Index: Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- Peak.cpp    29 Oct 2007 08:54:39 -0000      1.73
+++ Peak.cpp    29 Oct 2007 13:25:31 -0000      1.74
@@ -42,7 +42,7 @@
 
 #define NORMALIZE_CHUNK_SIZE   10000
 #define PEAKFILE_MAJOR_VERSION 1
-#define PEAKFILE_MINOR_VERSION 1
+#define PEAKFILE_MINOR_VERSION 2
 
 int Peak::zoomStep[] = {
        // non-cached zoomlevels.
@@ -509,7 +509,7 @@
                        PERROR("Could not read in all (%d) norm. data, only 
%d", data->pd->normDataCount, read);
                }
                
-               data->headerdata.normValuesDataOffset = 
data->headerdata.headerSize + totalBufferSize;
+               data->headerdata.normValuesDataOffset = 
data->headerdata.headerSize + totalBufferSize * sizeof(peak_data_t);
                
                data->normFile.close();
                
@@ -681,6 +681,7 @@
 {
        foreach(ChannelData* data, m_channelData) {
                if (!data->file.isOpen() || !m_peaksAvailable) {
+                       printf("either the file is not open, or no peak data 
available\n");
                        return 0.0f;
                }
        }