comparison plugins/ConstantQSpectrogram.cpp @ 237:43ff4dbb1278

Build fix
author Chris Cannam <cannam@all-day-breakfast.com>
date Mon, 03 Jun 2019 11:11:17 +0100
parents c9c562f37dd7
children
comparison
equal deleted inserted replaced
236:1701a56eb04e 237:43ff4dbb1278
221 setupConfig(); 221 setupConfig();
222 222
223 m_cq = new ConstantQ(m_config); 223 m_cq = new ConstantQ(m_config);
224 m_bins = m_cq->getK(); 224 m_bins = m_cq->getK();
225 m_cq->sparsekernel(); 225 m_cq->sparsekernel();
226 m_step = m_cq->gethop(); 226 m_step = m_cq->getHop();
227 m_block = m_cq->getfftlength(); 227 m_block = m_cq->getFFTLength();
228 228
229 if (blockSize != m_block) { 229 if (blockSize != m_block) {
230 std::cerr << "ConstantQSpectrogram::initialise: ERROR: supplied block size " << blockSize << " differs from required block size " << m_block << ", initialise failing" << std::endl; 230 std::cerr << "ConstantQSpectrogram::initialise: ERROR: supplied block size " << blockSize << " differs from required block size " << m_block << ", initialise failing" << std::endl;
231 delete m_cq; 231 delete m_cq;
232 m_cq = 0; 232 m_cq = 0;
246 if (m_cq) { 246 if (m_cq) {
247 delete m_cq; 247 delete m_cq;
248 m_cq = new ConstantQ(m_config); 248 m_cq = new ConstantQ(m_config);
249 m_bins = m_cq->getK(); 249 m_bins = m_cq->getK();
250 m_cq->sparsekernel(); 250 m_cq->sparsekernel();
251 m_step = m_cq->gethop(); 251 m_step = m_cq->getHop();
252 m_block = m_cq->getfftlength(); 252 m_block = m_cq->getFFTLength();
253 } 253 }
254 } 254 }
255 255
256 size_t 256 size_t
257 ConstantQSpectrogram::getPreferredStepSize() const 257 ConstantQSpectrogram::getPreferredStepSize() const
258 { 258 {
259 if (!m_step) { 259 if (!m_step) {
260 ConstantQ cq(m_config); 260 ConstantQ cq(m_config);
261 m_step = cq.gethop(); 261 m_step = cq.getHop();
262 m_block = cq.getfftlength(); 262 m_block = cq.getFFTLength();
263 } 263 }
264 264
265 return m_step; 265 return m_step;
266 } 266 }
267 267
268 size_t 268 size_t
269 ConstantQSpectrogram::getPreferredBlockSize() const 269 ConstantQSpectrogram::getPreferredBlockSize() const
270 { 270 {
271 if (!m_block) { 271 if (!m_block) {
272 ConstantQ cq(m_config); 272 ConstantQ cq(m_config);
273 m_step = cq.gethop(); 273 m_step = cq.getHop();
274 m_block = cq.getfftlength(); 274 m_block = cq.getFFTLength();
275 } 275 }
276 276
277 return m_block; 277 return m_block;
278 } 278 }
279 279