comparison src/Chromagram.cpp @ 180:6e4de8beb6b2

Avoid ambiguity about pow call
author Chris Cannam <c.cannam@qmul.ac.uk>
date Mon, 07 Sep 2015 14:45:07 +0100
parents a12642e36167
children
comparison
equal deleted inserted replaced
179:433e3aac9e52 180:6e4de8beb6b2
50 // Max frequency is frequency of the MIDI pitch just beyond the 50 // Max frequency is frequency of the MIDI pitch just beyond the
51 // top octave range (midiPitchLimit) minus one bin, then minus 51 // top octave range (midiPitchLimit) minus one bin, then minus
52 // floor(bins per semitone / 2) 52 // floor(bins per semitone / 2)
53 int bps = m_params.binsPerOctave / 12; 53 int bps = m_params.binsPerOctave / 12;
54 m_maxFrequency = midiPitchLimitFreq / 54 m_maxFrequency = midiPitchLimitFreq /
55 pow(2, (1.0 + floor(bps/2)) / m_params.binsPerOctave); 55 pow(2.0, (1.0 + floor(bps/2)) / m_params.binsPerOctave);
56 56
57 // Min frequency is frequency of midiPitchLimit lowered by the 57 // Min frequency is frequency of midiPitchLimit lowered by the
58 // appropriate number of octaveCount. 58 // appropriate number of octaveCount.
59 m_minFrequency = midiPitchLimitFreq / 59 m_minFrequency = midiPitchLimitFreq /
60 pow(2, m_params.octaveCount + 1); 60 pow(2.0, m_params.octaveCount + 1);
61 61
62 CQParameters p 62 CQParameters p
63 (params.sampleRate, m_minFrequency, m_maxFrequency, params.binsPerOctave); 63 (params.sampleRate, m_minFrequency, m_maxFrequency, params.binsPerOctave);
64 64
65 p.q = params.q; 65 p.q = params.q;