Mercurial > hg > match-vamp
changeset 153:fcf0dd0166b1 structure
Merge
| author | Chris Cannam |
|---|---|
| date | Fri, 23 Jan 2015 11:46:14 +0000 |
| parents | 4e7f8653c643 (current diff) d307803083e6 (diff) |
| children | 4159f6b71942 |
| files | src/MatchVampPlugin.cpp |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.linux Fri Jan 23 10:46:26 2015 +0000 +++ b/Makefile.linux Fri Jan 23 11:46:14 2015 +0000 @@ -1,6 +1,6 @@ -#CXXFLAGS += -fPIC -ffast-math -O3 -Wall -Werror -Wfloat-conversion -CXXFLAGS += -fPIC -g -Wall -Werror -DPERFORM_ERROR_CHECKS=1 +CXXFLAGS += -fPIC -ffast-math -O3 -Wall -Werror -Wfloat-conversion +#CXXFLAGS += -fPIC -g -Wall -Werror -DPERFORM_ERROR_CHECKS=1 LDFLAGS += -Wl,-Bstatic -lvamp-sdk -Wl,-Bdynamic PLUGIN_LDFLAGS += -shared -Wl,-Bsymbolic -Wl,-z,defs -lpthread -Wl,--version-script=vamp-plugin.map
--- a/src/MatchVampPlugin.cpp Fri Jan 23 10:46:26 2015 +0000 +++ b/src/MatchVampPlugin.cpp Fri Jan 23 11:46:14 2015 +0000 @@ -211,7 +211,7 @@ desc.description = "Total frame energy threshold below which a feature will be regarded as silent"; desc.minValue = 0; desc.maxValue = 1; - desc.defaultValue = m_defaultFcParams.silenceThreshold; + desc.defaultValue = (float)m_defaultFcParams.silenceThreshold; desc.isQuantized = false; list.push_back(desc); @@ -292,7 +292,7 @@ } else if (name == "smooth") { return m_smooth ? 1.0 : 0.0; } else if (name == "silencethreshold") { - return m_fcParams.silenceThreshold; + return (float)m_fcParams.silenceThreshold; } else if (name == "noise") { return m_dParams.noise; }
--- a/test/TestFeatureExtractor.cpp Fri Jan 23 10:46:26 2015 +0000 +++ b/test/TestFeatureExtractor.cpp Fri Jan 23 11:46:14 2015 +0000 @@ -14,7 +14,7 @@ static int freq2mid(double freq) { - return round(57.0 + 12.0 * log(freq / 220.) / log(2.)); + return int(round(57.0 + 12.0 * log(freq / 220.) / log(2.))); } static int freq2chroma(double freq)