Mercurial > hg > svcore
changeset 1111:457a1a619c5f simple-fft-model
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Wed, 07 Jan 2015 17:42:21 +0000 |
| parents | 16574eea3229 (current diff) 1517d4c60e88 (diff) |
| children | 4d7de68707c8 |
| files | data/fileio/CodedAudioFileReader.cpp data/fileio/WavFileReader.cpp data/model/test/TestFFTModel.h |
| diffstat | 5 files changed, 10 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/data/fileio/CodedAudioFileReader.cpp Tue Jun 30 10:26:23 2015 +0100 +++ b/data/fileio/CodedAudioFileReader.cpp Wed Jan 07 17:42:21 2015 +0000 @@ -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
--- a/data/model/EditableDenseThreeDimensionalModel.cpp Tue Jun 30 10:26:23 2015 +0100 +++ b/data/model/EditableDenseThreeDimensionalModel.cpp Wed Jan 07 17:42:21 2015 +0000 @@ -342,7 +342,7 @@ // assert(values == expandAndRetrieve(index)); - long windowStart = index; + sv_frame_t windowStart = index; windowStart *= m_resolution; if (m_notifyOnAdd) {
--- a/data/model/EditableDenseThreeDimensionalModel.h Tue Jun 30 10:26:23 2015 +0100 +++ b/data/model/EditableDenseThreeDimensionalModel.h Wed Jan 07 17:42:21 2015 +0000 @@ -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;
--- a/data/model/ImageModel.h Tue Jun 30 10:26:23 2015 +0100 +++ b/data/model/ImageModel.h Wed Jan 07 17:42:21 2015 +0000 @@ -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;
--- a/data/model/SparseTimeValueModel.h Tue Jun 30 10:26:23 2015 +0100 +++ b/data/model/SparseTimeValueModel.h Wed Jan 07 17:42:21 2015 +0000 @@ -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;