Mercurial > hg > tuning-difference
changeset 54:d96eb87060c6
Minor tweaks
| author | Chris Cannam |
|---|---|
| date | Thu, 11 Jul 2019 09:19:21 +0100 |
| parents | abf218df58cf |
| children | 7bdcc40deebe |
| files | Makefile.linux Makefile.osx src/BulkTuningDifference.cpp |
| diffstat | 3 files changed, 8 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile.linux Thu Jul 11 08:57:51 2019 +0100 +++ b/Makefile.linux Thu Jul 11 09:19:21 2019 +0100 @@ -1,8 +1,9 @@ -#CXXFLAGS := -Wall -Wextra -Werror -g -fPIC -std=c++11 +#CFLAGS := -Wall -Wextra -Werror -g -fPIC -std=c++11 -CXXFLAGS := -Wall -Wextra -Werror -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC -std=c++11 +CFLAGS := -Wall -Wextra -Werror -O3 -msse -msse2 -mfpmath=sse -ftree-vectorize -fPIC +CXXFLAGS := -std=c++11 VAMPSDK_DIR := ../vamp-plugin-sdk
--- a/Makefile.osx Thu Jul 11 08:57:51 2019 +0100 +++ b/Makefile.osx Thu Jul 11 09:19:21 2019 +0100 @@ -2,6 +2,7 @@ #CFLAGS := -Wall -Wextra -g -fPIC CFLAGS := -Wall -Wextra -O3 -ftree-vectorize -fPIC +CXXFLAGS := -std=c++11 ARCHFLAGS ?= -arch x86_64 -mmacosx-version-min=10.7 -stdlib=libc++
--- a/src/BulkTuningDifference.cpp Thu Jul 11 08:57:51 2019 +0100 +++ b/src/BulkTuningDifference.cpp Thu Jul 11 09:19:21 2019 +0100 @@ -223,11 +223,11 @@ d.name = "Tuning Differences"; d.description = "A single feature vector containing a value for each input channel after the first (reference) channel, containing the difference in averaged frequency profile between that channel and the reference channel, in cents. A positive value means the corresponding channel is higher than the reference."; d.unit = "cents"; + d.hasFixedBinCount = true; if (m_channelCount > 1) { - d.hasFixedBinCount = true; d.binCount = m_channelCount - 1; } else { - d.hasFixedBinCount = false; + d.binCount = 1; } d.hasKnownExtents = false; d.isQuantized = false; @@ -240,11 +240,11 @@ d.name = "Relative Tuning Frequencies"; d.description = "A single feature vector containing a value for each input channel after the first (reference) channel, containing the tuning frequency of that channel, if the reference channel is assumed to contain the same music as it at a tuning frequency of A=440Hz."; d.unit = "hz"; + d.hasFixedBinCount = true; if (m_channelCount > 1) { - d.hasFixedBinCount = true; d.binCount = m_channelCount - 1; } else { - d.hasFixedBinCount = false; + d.binCount = 1; } d.hasKnownExtents = false; d.isQuantized = false;