Mercurial > hg > svgui
comparison layer/SpectrumLayer.h @ 1374:631897ba9fca zoom
Merge from default branch
author | Chris Cannam |
---|---|
date | Tue, 06 Nov 2018 08:59:03 +0000 |
parents | d79e21855aef |
children | 2df1af7ac752 |
comparison
equal
deleted
inserted
replaced
1360:e848ea0850fe | 1374:631897ba9fca |
---|---|
109 | 109 |
110 protected: | 110 protected: |
111 DenseTimeValueModel *m_originModel; | 111 DenseTimeValueModel *m_originModel; |
112 int m_channel; | 112 int m_channel; |
113 bool m_channelSet; | 113 bool m_channelSet; |
114 int m_windowSize; | 114 int m_windowSize; |
115 WindowType m_windowType; | 115 WindowType m_windowType; |
116 int m_windowHopLevel; | 116 int m_windowHopLevel; |
117 bool m_showPeaks; | 117 bool m_showPeaks; |
118 mutable bool m_newFFTNeeded; | 118 mutable bool m_newFFTNeeded; |
119 | 119 |
120 mutable QMutex m_fftMutex; | 120 mutable QMutex m_fftMutex; |
121 | 121 |