Mercurial > hg > vamp-tempogram
changeset 60:ac1a75151fc9 tip
isnan(int) is meaningless, and msvc refuses it as ambiguous
author | Chris Cannam |
---|---|
date | Wed, 18 Dec 2019 16:47:10 +0000 |
parents | 02721bb9c4f0 |
children | |
files | TempogramPlugin.cpp |
diffstat | 1 files changed, 3 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/TempogramPlugin.cpp Thu Oct 16 15:14:02 2014 +0100 +++ b/TempogramPlugin.cpp Wed Dec 18 16:47:10 2019 +0000 @@ -14,6 +14,8 @@ #include "TempogramPlugin.h" +#include <algorithm> + using Vamp::FFT; using Vamp::RealTime; using namespace std; @@ -361,7 +363,7 @@ d1.description = "Cyclic tempogram calculated by \"octave folding\" the DFT tempogram"; d1.unit = ""; d1.hasFixedBinCount = true; - d1.binCount = m_cyclicTempogramOctaveDivider > 0 && !isnan(m_cyclicTempogramOctaveDivider) ? m_cyclicTempogramOctaveDivider : 0; + d1.binCount = m_cyclicTempogramOctaveDivider > 0 ? m_cyclicTempogramOctaveDivider : 0; d1.hasKnownExtents = false; d1.isQuantized = false; d1.sampleType = OutputDescriptor::FixedSampleRate;