Mercurial > hg > match-vamp
changeset 165:31602361fb65 refactors
Build stuff
| author | Chris Cannam |
|---|---|
| date | Fri, 30 Jan 2015 14:54:18 +0000 |
| parents | 13774b008b6a |
| children | d23dad16d6f9 |
| files | Makefile.linux src/Finder.cpp src/MatchVampPlugin.cpp test/TestFeatureExtractor.cpp |
| diffstat | 4 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.linux Fri Jan 30 12:57:29 2015 +0000 +++ b/Makefile.linux Fri Jan 30 14:54:18 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/Finder.cpp Fri Jan 30 12:57:29 2015 +0000 +++ b/src/Finder.cpp Fri Jan 30 14:54:18 2015 +0000 @@ -345,7 +345,7 @@ return 0; } - return m_m->getNormalisedPathCost(ey, ex); + return m_m->getPathCost(ey, ex); } int
--- a/src/MatchVampPlugin.cpp Fri Jan 30 12:57:29 2015 +0000 +++ b/src/MatchVampPlugin.cpp Fri Jan 30 14:54:18 2015 +0000 @@ -243,8 +243,8 @@ desc.name = "Silence threshold"; desc.description = "Total frame energy threshold below which a feature will be regarded as silent"; desc.minValue = 0; - desc.maxValue = 0.1; - desc.defaultValue = m_defaultFcParams.silenceThreshold; + desc.maxValue = 0.1f; + desc.defaultValue = (float)m_defaultFcParams.silenceThreshold; desc.isQuantized = false; list.push_back(desc); @@ -335,7 +335,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 == "metric") { return (int)m_dParams.metric; } else if (name == "noise") {
--- a/test/TestFeatureExtractor.cpp Fri Jan 30 12:57:29 2015 +0000 +++ b/test/TestFeatureExtractor.cpp Fri Jan 30 14:54:18 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)