Mercurial > hg > segmenter-vamp-plugin
changeset 16:4f9d59b0526e slimline
Fix caps in another couple of method names to avoid looking like classes
| author | Chris Cannam |
|---|---|
| date | Thu, 10 May 2012 10:23:37 +0100 |
| parents | 3ef0ee41ecc2 |
| children | 6f87e0cb5e5e |
| files | songparts/SongParts.cpp songparts/SongParts.h songparts/SongParts.o |
| diffstat | 3 files changed, 9 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/songparts/SongParts.cpp Thu May 10 10:22:04 2012 +0100 +++ b/songparts/SongParts.cpp Thu May 10 10:23:37 2012 +0100 @@ -754,8 +754,8 @@ return FeatureSet(); } - FeatureSet masterFeatureset = BeatTrack(); - FeatureList chromaList = ChromaFeatures(); + FeatureSet masterFeatureset = beatTrack(); + FeatureList chromaList = chromaFeatures(); for (size_t i = 0; i < chromaList.size(); ++i) { @@ -763,7 +763,7 @@ } // quantised and pseudo-quantised (beat-wise) chroma - std::vector<FeatureList> quantisedChroma = BeatQuantiser(chromaList, masterFeatureset[m_beatOutputNumber]); + std::vector<FeatureList> quantisedChroma = beatQuantiser(chromaList, masterFeatureset[m_beatOutputNumber]); masterFeatureset[m_qchromafwOutputNumber] = quantisedChroma[0]; masterFeatureset[m_qchromaOutputNumber] = quantisedChroma[1]; @@ -776,7 +776,7 @@ /* ------ Beat Tracker ------ */ -SongPartitioner::FeatureSet SongPartitioner::BeatTrack() +SongPartitioner::FeatureSet SongPartitioner::beatTrack() { vector<double> df; vector<double> beatPeriod; @@ -873,7 +873,7 @@ /* ------ Chroma Extractor ------ */ -SongPartitioner::FeatureList SongPartitioner::ChromaFeatures() +SongPartitioner::FeatureList SongPartitioner::chromaFeatures() { FeatureList returnFeatureList; @@ -1074,7 +1074,7 @@ /* ------ Beat Quantizer ------ */ std::vector<Vamp::Plugin::FeatureList> -SongPartitioner::BeatQuantiser(Vamp::Plugin::FeatureList chromagram, Vamp::Plugin::FeatureList beats) +SongPartitioner::beatQuantiser(Vamp::Plugin::FeatureList chromagram, Vamp::Plugin::FeatureList beats) { std::vector<FeatureList> returnVector;
--- a/songparts/SongParts.h Thu May 10 10:22:04 2012 +0100 +++ b/songparts/SongParts.h Thu May 10 10:23:37 2012 +0100 @@ -59,9 +59,9 @@ static size_t m_chromaStepsizeFactor; int m_bpb; int m_pluginFrameCount; - FeatureSet BeatTrack(); - FeatureList ChromaFeatures(); - std::vector<FeatureList> BeatQuantiser(FeatureList chromagram, FeatureList beats); + FeatureSet beatTrack(); + FeatureList chromaFeatures(); + std::vector<FeatureList> beatQuantiser(FeatureList chromagram, FeatureList beats); FeatureList runSegmenter(FeatureList quantisedChromagram); mutable int m_beatOutputNumber;