Mercurial > hg > qm-vamp-plugins
comparison plugins/AdaptiveSpectrogram.cpp @ 178:f96ea0e4b475
Fix compiler warnings with -Wall -Wextra
author | Chris Cannam <c.cannam@qmul.ac.uk> |
---|---|
date | Mon, 28 Sep 2015 12:33:17 +0100 |
parents | 3402a7a249a1 |
children |
comparison
equal
deleted
inserted
replaced
177:a83a81ed1303 | 178:f96ea0e4b475 |
---|---|
37 Plugin(inputSampleRate), | 37 Plugin(inputSampleRate), |
38 m_w(8), | 38 m_w(8), |
39 m_n(2), | 39 m_n(2), |
40 m_coarse(false), | 40 m_coarse(false), |
41 m_threaded(true), | 41 m_threaded(true), |
42 m_threadsInUse(false), | |
43 m_decFactor(1), | 42 m_decFactor(1), |
43 m_buffer(0), | |
44 m_buflen(0), | 44 m_buflen(0), |
45 m_buffer(0), | 45 m_decimator(0), |
46 m_decimator(0) | 46 m_threadsInUse(false) |
47 { | 47 { |
48 } | 48 } |
49 | 49 |
50 AdaptiveSpectrogram::~AdaptiveSpectrogram() | 50 AdaptiveSpectrogram::~AdaptiveSpectrogram() |
51 { | 51 { |
52 for (int i = 0; i < m_cutThreads.size(); ++i) { | 52 for (int i = 0; i < int(m_cutThreads.size()); ++i) { |
53 delete m_cutThreads[i]; | 53 delete m_cutThreads[i]; |
54 } | 54 } |
55 m_cutThreads.clear(); | 55 m_cutThreads.clear(); |
56 | 56 |
57 for (FFTMap::iterator i = m_fftThreads.begin(); | 57 for (FFTMap::iterator i = m_fftThreads.begin(); |
287 d.isQuantized = false; | 287 d.isQuantized = false; |
288 d.sampleType = OutputDescriptor::FixedSampleRate; | 288 d.sampleType = OutputDescriptor::FixedSampleRate; |
289 d.sampleRate = m_inputSampleRate / (m_decFactor * ((2 << m_w) / 2)); | 289 d.sampleRate = m_inputSampleRate / (m_decFactor * ((2 << m_w) / 2)); |
290 d.hasDuration = false; | 290 d.hasDuration = false; |
291 char name[20]; | 291 char name[20]; |
292 for (int i = 0; i < d.binCount; ++i) { | 292 for (int i = 0; i < int(d.binCount); ++i) { |
293 float freq = (m_inputSampleRate / (m_decFactor * (d.binCount * 2)) * (i + 1)); // no DC bin | 293 float freq = (m_inputSampleRate / (m_decFactor * (d.binCount * 2)) * (i + 1)); // no DC bin |
294 sprintf(name, "%.1f Hz", freq); | 294 sprintf(name, "%.1f Hz", freq); |
295 d.binNames.push_back(name); | 295 d.binNames.push_back(name); |
296 } | 296 } |
297 list.push_back(d); | 297 list.push_back(d); |
305 FeatureSet fs; | 305 FeatureSet fs; |
306 return fs; | 306 return fs; |
307 } | 307 } |
308 | 308 |
309 AdaptiveSpectrogram::FeatureSet | 309 AdaptiveSpectrogram::FeatureSet |
310 AdaptiveSpectrogram::process(const float *const *inputBuffers, RealTime ts) | 310 AdaptiveSpectrogram::process(const float *const *inputBuffers, RealTime) |
311 { | 311 { |
312 // framing: shift and write the new data to right half | 312 // framing: shift and write the new data to right half |
313 for (int i = 0; i < m_buflen/2; ++i) { | 313 for (int i = 0; i < m_buflen/2; ++i) { |
314 m_buffer[i] = m_buffer[m_buflen/2 + i]; | 314 m_buffer[i] = m_buffer[m_buflen/2 + i]; |
315 } | 315 } |
390 | 390 |
391 assemble(s, cutting, rmat, 0, 0, maxwid/minwid, cutwid); | 391 assemble(s, cutting, rmat, 0, 0, maxwid/minwid, cutwid); |
392 | 392 |
393 cutting->erase(); | 393 cutting->erase(); |
394 | 394 |
395 for (int i = 0; i < rmat.size(); ++i) { | 395 for (int i = 0; i < int(rmat.size()); ++i) { |
396 Feature f; | 396 Feature f; |
397 f.hasTimestamp = false; | 397 f.hasTimestamp = false; |
398 f.values = rmat[i]; | 398 f.values = rmat[i]; |
399 fs[0].push_back(f); | 399 fs[0].push_back(f); |
400 } | 400 } |