From afeab2e67f0f604161e9d44d13efc8f2cfef0c72 Mon Sep 17 00:00:00 2001
From: Guillaume Pellerin <yomguy@parisson.com>
Date: Fri, 11 Oct 2013 10:13:50 +0200
Subject: [PATCH] cleanup

---
 timeside/analyzer/spectrogram.py | 13 ++++---------
 timeside/analyzer/waveform.py    | 14 ++++----------
 2 files changed, 8 insertions(+), 19 deletions(-)

diff --git a/timeside/analyzer/spectrogram.py b/timeside/analyzer/spectrogram.py
index be3fbda..c5488b2 100644
--- a/timeside/analyzer/spectrogram.py
+++ b/timeside/analyzer/spectrogram.py
@@ -36,13 +36,8 @@ class Spectrogram(Analyzer):
     @interfacedoc
     def setup(self, channels=None, samplerate=None,
               blocksize=None, totalframes=None):
-        super(
-            Spectrogram,
-            self).setup(
-            channels,
-            samplerate,
-            blocksize,
-            totalframes)
+        super(Spectrogram, self).setup(channels, samplerate,
+              blocksize, totalframes)
 
         self.values = []
         self.FFT_SIZE = 2048
@@ -71,12 +66,12 @@ class Spectrogram(Analyzer):
 
     def release(self):
         # set Result
-        spectrogram = self.new_result(data_mode='value', time_mode='framewise')
+        spectrogram = self.new_result(dataMode='value', timeMode='framewise')
 
         # parameters :
         spectrogram.parameters = {'FFT_SIZE': self.FFT_SIZE}
 
         # Set Data
-        spectrogram.data_object.value = self.values
+        spectrogram.dataObject.value = self.values
 
         self._results.add(spectrogram)
diff --git a/timeside/analyzer/waveform.py b/timeside/analyzer/waveform.py
index a980174..8f64bfb 100644
--- a/timeside/analyzer/waveform.py
+++ b/timeside/analyzer/waveform.py
@@ -36,14 +36,8 @@ class Waveform(Analyzer):
     @interfacedoc
     def setup(self, channels=None, samplerate=None,
               blocksize=None, totalframes=None):
-        super(
-            Waveform,
-            self).setup(
-            channels,
-            samplerate,
-            blocksize,
-            totalframes)
-
+        super(Waveform, self).setup(channels, samplerate,
+              blocksize, totalframes)
         self.values = []
         self.result_blocksize = 1
         self.result_stepsize = 1
@@ -71,9 +65,9 @@ class Waveform(Analyzer):
 
     def release(self):
         # set Result
-        waveform = self.new_result(data_mode='value', time_mode='framewise')
+        waveform = self.new_result(dataMode='value', timeMode='framewise')
 
         # Set Data
-        waveform.data_object.value = np.asarray(self.values).flatten()
+        waveform.dataObject.value = np.asarray(self.values).flatten()
 
         self._results.add(waveform)
-- 
2.39.5