Mercurial > hg > svcore
diff data/model/EditableDenseThreeDimensionalModel.h @ 1111:457a1a619c5f simple-fft-model
Merge from default branch
author | Chris Cannam |
---|---|
date | Wed, 07 Jan 2015 17:42:21 +0000 |
parents | 1517d4c60e88 |
children | aa588c391d1a |
line wrap: on
line diff
--- 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;