Mercurial > hg > svcore
comparison data/model/FFTModel.cpp @ 1134:f8604a7c4660 3.0-integration
Merge from branch "tony-2.0-integration"
| author | Chris Cannam | 
|---|---|
| date | Wed, 14 Oct 2015 10:12:14 +0100 | 
| parents | e994747fb9dd | 
| children | e94719f941ba aa588c391d1a | 
   comparison
  equal
  deleted
  inserted
  replaced
| 1132:0cb263a2f52c | 1134:f8604a7c4660 | 
|---|---|
| 49 if (m_windowSize > m_fftSize) { | 49 if (m_windowSize > m_fftSize) { | 
| 50 cerr << "ERROR: FFTModel::FFTModel: window size (" << m_windowSize | 50 cerr << "ERROR: FFTModel::FFTModel: window size (" << m_windowSize | 
| 51 << ") must be at least FFT size (" << m_fftSize << ")" << endl; | 51 << ") must be at least FFT size (" << m_fftSize << ")" << endl; | 
| 52 throw invalid_argument("FFTModel window size must be at least FFT size"); | 52 throw invalid_argument("FFTModel window size must be at least FFT size"); | 
| 53 } | 53 } | 
| 54 | |
| 55 connect(model, SIGNAL(modelChanged()), this, SIGNAL(modelChanged())); | |
| 56 connect(model, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t)), | |
| 57 this, SIGNAL(modelChangedWithin(sv_frame_t, sv_frame_t))); | |
| 54 } | 58 } | 
| 55 | 59 | 
| 56 FFTModel::~FFTModel() | 60 FFTModel::~FFTModel() | 
| 57 { | 61 { | 
| 58 } | 62 } | 
