From da24da6b30c6f5935975e4eec331c21b2522a98b Mon Sep 17 00:00:00 2001 From: Paul Brossier Date: Sun, 21 Jul 2013 19:20:33 -0500 Subject: [PATCH] timeside/analyzer/aubio_{pitch,temporal}.py: validate changes --- timeside/analyzer/aubio_pitch.py | 1 - timeside/analyzer/aubio_temporal.py | 4 +--- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/timeside/analyzer/aubio_pitch.py b/timeside/analyzer/aubio_pitch.py index ed151fe..dc502b0 100644 --- a/timeside/analyzer/aubio_pitch.py +++ b/timeside/analyzer/aubio_pitch.py @@ -71,7 +71,6 @@ class AubioPitch(Processor): samplerate = self.samplerate() blocksize = self.win_s stepsize = self.hop_s - # parameters : None # TODO check with Piem "default" and "freq" in setup # Set metadata pitch.metadata = AnalyzerMetadata(id="aubio_pitch", diff --git a/timeside/analyzer/aubio_temporal.py b/timeside/analyzer/aubio_temporal.py index bb8d224..d30f621 100644 --- a/timeside/analyzer/aubio_temporal.py +++ b/timeside/analyzer/aubio_temporal.py @@ -98,7 +98,6 @@ class AubioTemporal(Processor): onsetrate.metadata = dict(onsetrateAttr.items() + commonAttr.items()) # Set Data if len(self.onsets) > 1: - #periods = [60./(b - a) for a,b in zip(self.onsets[:-1],self.onsets[1:])] periods = 60. / numpy.diff(self.onsets) onsetrate.data = periods else: @@ -127,10 +126,9 @@ class AubioTemporal(Processor): bpm.metadata = dict(bpmAttr.items() + commonAttr.items()) # Set Data if len(self.beats) > 1: - #periods = [60./(b - a) for a,b in zip(self.beats[:-1],self.beats[1:])] periods = 60. / numpy.diff(self.beats) bpm.data = periods else: bpm.data = [] - return AnalyzerResultContainer([onsets, onsetrate, beats, bpm]) \ No newline at end of file + return AnalyzerResultContainer([onsets, onsetrate, beats, bpm]) -- 2.39.5