# HG changeset patch # User Chris Cannam # Date 1336641667 -3600 # Node ID 8aa828dd7d9fc1415710e4d71acca53cad0d6795 # Parent ac07c60aa7984c7f913f327fd68fd42daa1b8d76 Rename method Segmenter to runSegmenter to avoid looking like a class name diff -r ac07c60aa798 -r 8aa828dd7d9f songparts/SongParts.cpp --- 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(); diff -r ac07c60aa798 -r 8aa828dd7d9f songparts/SongParts.h --- 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 BeatQuantiser(FeatureList chromagram, FeatureList beats); - FeatureList Segmenter(FeatureList quantisedChromagram); + FeatureList runSegmenter(FeatureList quantisedChromagram); mutable int m_beatOutputNumber; mutable int m_barsOutputNumber; diff -r ac07c60aa798 -r 8aa828dd7d9f songparts/SongParts.o Binary file songparts/SongParts.o has changed