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

[Ben Levitt]

CVSROOT:        /sources/traverso
Module name:    traverso
Changes by:     Ben Levitt <benjie>     07/05/17 23:27:54

Modified files:
        src/core       : Peak.cpp Peak.h 
        src/traverso/songcanvas: TimeLineView.cpp 

Log message:
        2 more zoom levels.  Peaks will automatically be rebuilt.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.cpp?cvsroot=traverso&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/traverso/src/core/Peak.h?cvsroot=traverso&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/traverso/src/traverso/songcanvas/TimeLineView.cpp?cvsroot=traverso&r1=1.35&r2=1.36

Patches:
Index: core/Peak.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- core/Peak.cpp       6 May 2007 13:29:40 -0000       1.21
+++ core/Peak.cpp       17 May 2007 23:27:53 -0000      1.22
@@ -42,10 +42,10 @@
 
 #define NORMALIZE_CHUNK_SIZE   10000
 #define PEAKFILE_MAJOR_VERSION 0
-#define PEAKFILE_MINOR_VERSION 7
+#define PEAKFILE_MINOR_VERSION 8
 
 int Peak::zoomStep[] = {1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 
4096,
-                               8192, 16384, 32768, 65536, 131072, 262144};
+                               8192, 16384, 32768, 65536, 131072, 262144, 
524288, 1048576};
 
 Peak::Peak(AudioSource* source, int channel)
        : m_channel(channel)

Index: core/Peak.h
===================================================================
RCS file: /sources/traverso/traverso/src/core/Peak.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- core/Peak.h 19 Apr 2007 19:58:39 -0000      1.9
+++ core/Peak.h 17 May 2007 23:27:54 -0000      1.10
@@ -44,8 +44,8 @@
 struct PeakData {
        int peakDataOffset;
        int normValuesDataOffset;
-       int peakDataLevelOffsets[18 - 6];
-       int peakDataSizeForLevel[18 - 6];
+       int peakDataLevelOffsets[20 - 6];  // FIXME: Magic Numbers!
+       int peakDataSizeForLevel[20 - 6];
        char label[6];  //TPFxxx -> Traverso Peak File version x.x.x
        int version[2];
 
@@ -56,7 +56,7 @@
        Q_OBJECT
 
 public:
-       static const int ZOOM_LEVELS = 18;
+       static const int ZOOM_LEVELS = 20;
        static const int MAX_ZOOM_USING_SOURCEFILE;
        static const int MAX_DB_VALUE;
        static int zoomStep[ZOOM_LEVELS + 1];

Index: traverso/songcanvas/TimeLineView.cpp
===================================================================
RCS file: /sources/traverso/traverso/src/traverso/songcanvas/TimeLineView.cpp,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- traverso/songcanvas/TimeLineView.cpp        11 May 2007 22:12:50 -0000      
1.35
+++ traverso/songcanvas/TimeLineView.cpp        17 May 2007 23:27:54 -0000      
1.36
@@ -203,6 +203,8 @@
 
        setAcceptsHoverEvents(true);
 
+       m_zooms[524288] = "20:00.000";
+       m_zooms[262144] = "10:00.000";
        m_zooms[131072] = "5:00.000";
        m_zooms[ 65536] = "2:30.000";
        m_zooms[ 32768] = "1:00.000";