Mercurial > hg > segmenter-vamp-plugin
changeset 14:8aa828dd7d9f slimline
Rename method Segmenter to runSegmenter to avoid looking like a class name
| author | Chris Cannam |
|---|---|
| date | Thu, 10 May 2012 10:21:07 +0100 |
| parents | ac07c60aa798 |
| children | 3ef0ee41ecc2 |
| files | songparts/SongParts.cpp songparts/SongParts.h songparts/SongParts.o |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/songparts/SongParts.cpp Thu May 10 10:20:23 2012 +0100 +++ b/songparts/SongParts.cpp Thu May 10 10:21:07 2012 +0100 @@ -769,7 +769,7 @@ masterFeatureset[m_qchromaOutputNumber] = quantisedChroma[1]; // Segmentation - masterFeatureset[m_segmOutputNumber] = Segmenter(quantisedChroma[1]); + masterFeatureset[m_segmOutputNumber] = runSegmenter(quantisedChroma[1]); return(masterFeatureset); } @@ -1770,7 +1770,7 @@ } // Segmenter -Vamp::Plugin::FeatureList SongPartitioner::Segmenter(Vamp::Plugin::FeatureList quantisedChromagram) +Vamp::Plugin::FeatureList SongPartitioner::runSegmenter(Vamp::Plugin::FeatureList quantisedChromagram) { /* --- Display Information --- */ int numBeat = quantisedChromagram.size();
--- a/songparts/SongParts.h Thu May 10 10:20:23 2012 +0100 +++ b/songparts/SongParts.h Thu May 10 10:21:07 2012 +0100 @@ -62,7 +62,7 @@ FeatureSet BeatTrack(); FeatureList ChromaFeatures(); std::vector<FeatureList> BeatQuantiser(FeatureList chromagram, FeatureList beats); - FeatureList Segmenter(FeatureList quantisedChromagram); + FeatureList runSegmenter(FeatureList quantisedChromagram); mutable int m_beatOutputNumber; mutable int m_barsOutputNumber;