projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NOOP, re-indent.
[ardour.git]
/
libs
/
vamp-plugins
/
SpectralCentroid.cpp
diff --git
a/libs/vamp-plugins/SpectralCentroid.cpp
b/libs/vamp-plugins/SpectralCentroid.cpp
index f93fdcaa32e4eb2b763e82cd32d64da9d4f21676..762af53989accd650c920249439f0db32b161752 100644
(file)
--- a/
libs/vamp-plugins/SpectralCentroid.cpp
+++ b/
libs/vamp-plugins/SpectralCentroid.cpp
@@
-40,11
+40,11
@@
#include <float.h>
// 'std::isinf()' and 'std::isnan()' are not available in MSVC.
#include <float.h>
// 'std::isinf()' and 'std::isnan()' are not available in MSVC.
-#define isinf(val) !((bool)_finite((double)val))
-#define isnan(val) (bool)_isnan((double)val)
+#define isinf
_local
(val) !((bool)_finite((double)val))
+#define isnan
_local
(val) (bool)_isnan((double)val)
#else
#else
-using std::isnan;
-using std::isinf;
+#define isinf_local std::isinf
+#define isnan_local std::isnan
#endif
#include "SpectralCentroid.h"
#endif
#include "SpectralCentroid.h"
@@
-176,13
+176,13
@@
SpectralCentroid::process(const float *const *inputBuffers, Vamp::RealTime)
Feature feature;
feature.hasTimestamp = false;
Feature feature;
feature.hasTimestamp = false;
- if (!isnan
(centroidLog) && !isinf
(centroidLog)) {
+ if (!isnan
_local(centroidLog) && !isinf_local
(centroidLog)) {
feature.values.push_back(centroidLog);
}
returnFeatures[0].push_back(feature);
feature.values.clear();
feature.values.push_back(centroidLog);
}
returnFeatures[0].push_back(feature);
feature.values.clear();
- if (!isnan
(centroidLin) && !isinf
(centroidLin)) {
+ if (!isnan
_local(centroidLin) && !isinf_local
(centroidLin)) {
feature.values.push_back(centroidLin);
}
returnFeatures[1].push_back(feature);
feature.values.push_back(centroidLin);
}
returnFeatures[1].push_back(feature);