# HG changeset patch # User Chris Cannam # Date 1374686695 -3600 # Node ID a1bb2989013dc380e3baf6b6e9704520f62b3bc0 # Parent 12aff5a181bc6376c546ebbb27f48f99e2619ae8# Parent 2f85f0fbf7ab6d67b7c8f79456c76106a0db4785 Merge diff -r 12aff5a181bc -r a1bb2989013d data/model/Labeller.h --- a/data/model/Labeller.h Wed Jul 24 18:12:57 2013 +0100 +++ b/data/model/Labeller.h Wed Jul 24 18:24:55 2013 +0100 @@ -134,6 +134,12 @@ void setSampleRate(float rate) { m_rate = rate; } + void resetCounters() { + m_counter = 1; + m_counter2 = 1; + m_cycle = 4; + } + void incrementCounter() { m_counter++; if (m_type == ValueFromCyclicalCounter ||