# HG changeset patch
# User Chris Cannam
# Date 1435771888 -3600
# Node ID 4d7de68707c8f1b47695f65c3a95eba4557de6aa
# Parent  a65328f0c45067b31d55cdf4b0aa97f646bab37d# Parent  457a1a619c5fedf4591bca81ff58df0baa0bafc7
Merge from branch simple-fft-model

diff -r a65328f0c450 -r 4d7de68707c8 data/fileio/CodedAudioFileReader.cpp
--- a/data/fileio/CodedAudioFileReader.cpp	Wed Jul 01 13:27:03 2015 +0100
+++ b/data/fileio/CodedAudioFileReader.cpp	Wed Jul 01 18:31:28 2015 +0100
@@ -452,6 +452,7 @@
         sv_frame_t ix0 = start * m_channelCount;
         sv_frame_t ix1 = ix0 + (count * m_channelCount);
 
+
         // This lock used to be a QReadWriteLock, but it appears that
         // its lock mechanism is significantly slower than QMutex so
         // it's not a good idea in cases like this where we don't
diff -r a65328f0c450 -r 4d7de68707c8 data/model/EditableDenseThreeDimensionalModel.cpp
--- a/data/model/EditableDenseThreeDimensionalModel.cpp	Wed Jul 01 13:27:03 2015 +0100
+++ b/data/model/EditableDenseThreeDimensionalModel.cpp	Wed Jul 01 18:31:28 2015 +0100
@@ -342,7 +342,7 @@
 
 //    assert(values == expandAndRetrieve(index));
 
-    long windowStart = index;
+    sv_frame_t windowStart = index;
     windowStart *= m_resolution;
 
     if (m_notifyOnAdd) {
diff -r a65328f0c450 -r 4d7de68707c8 data/model/EditableDenseThreeDimensionalModel.h
--- a/data/model/EditableDenseThreeDimensionalModel.h	Wed Jul 01 13:27:03 2015 +0100
+++ b/data/model/EditableDenseThreeDimensionalModel.h	Wed Jul 01 18:31:28 2015 +0100
@@ -222,8 +222,8 @@
     float m_maximum;
     bool m_haveExtents;
     bool m_notifyOnAdd;
-    long m_sinceLastNotifyMin;
-    long m_sinceLastNotifyMax;
+    sv_frame_t m_sinceLastNotifyMin;
+    sv_frame_t m_sinceLastNotifyMax;
     int m_completion;
 
     mutable QReadWriteLock m_lock;
diff -r a65328f0c450 -r 4d7de68707c8 data/model/ImageModel.h
--- a/data/model/ImageModel.h	Wed Jul 01 13:27:03 2015 +0100
+++ b/data/model/ImageModel.h	Wed Jul 01 18:31:28 2015 +0100
@@ -31,13 +31,13 @@
 struct ImagePoint : public XmlExportable
 {
 public:
-    ImagePoint(long _frame) : frame(_frame) { }
-    ImagePoint(long _frame, QString _image, QString _label) :
+    ImagePoint(sv_frame_t _frame) : frame(_frame) { }
+    ImagePoint(sv_frame_t _frame, QString _image, QString _label) :
         frame(_frame), image(_image), label(_label) { }
 
     int getDimensions() const { return 1; }
     
-    long frame;
+    sv_frame_t frame;
     QString image;
     QString label;
 
diff -r a65328f0c450 -r 4d7de68707c8 data/model/SparseTimeValueModel.h
--- a/data/model/SparseTimeValueModel.h	Wed Jul 01 13:27:03 2015 +0100
+++ b/data/model/SparseTimeValueModel.h	Wed Jul 01 18:31:28 2015 +0100
@@ -29,13 +29,13 @@
 struct TimeValuePoint
 {
 public:
-    TimeValuePoint(long _frame) : frame(_frame), value(0.0f) { }
-    TimeValuePoint(long _frame, float _value, QString _label) : 
+    TimeValuePoint(sv_frame_t _frame) : frame(_frame), value(0.0f) { }
+    TimeValuePoint(sv_frame_t _frame, float _value, QString _label) : 
 	frame(_frame), value(_value), label(_label) { }
 
     int getDimensions() const { return 2; }
     
-    long frame;
+    sv_frame_t frame;
     float value;
     QString label;