change some visualizer names

diff --git a/telemeta/analysis/core.py b/telemeta/analysis/core.py
index 2347bb3eb5462c666aac7e7ba9e6c58695d3e435..12b54ba22ebfbdf123f292781a466485632f19c1 100644 (file)
--- a/telemeta/analysis/core.py
+++ b/telemeta/analysis/core.py
@@ -44,20 +44,18 @@ class AudioProcessor(Component):
         self.format = self.audio_file.get_file_format()
         self.encoding = self.audio_file.get_encoding()
 
-    def post_process(self, audio_file):
-        pass
-
-    def get_mono_samples(self):
+    def get_samples(self):
         samples = self.audio_file.read_frames(self.frames)
+        return samples
+        
+    def get_mono_samples(self):
         # convert to mono by selecting left channel only
+        samples = self.get_samples()
         if self.channels > 1:
-            samples = samples[:,0]
-        return samples
+            return samples[:,0]
+        else:
+            return samples
 
-    def get_samples(self):
-        samples = self.audio_file.read_frames(self.frames)
-        return samples  
-        
     def read(self, start, size, resize_if_less=False):
         """ read size samples starting at start, if resize_if_less is True and less than size
         samples are read, resize the array to size and fill with zeros """

diff --git a/telemeta/visualization/spectrogram_octave.py b/telemeta/visualization/spectrogram_octave.py
index b130e01fbd11d3b87b5302b5c3557c1b031513ee..b3fe33ba9f0ce12054cd25fa3266c93a2b1b56ce 100644 (file)
--- a/telemeta/visualization/spectrogram_octave.py
+++ b/telemeta/visualization/spectrogram_octave.py
@@ -12,7 +12,7 @@ from telemeta.core import *
 from telemeta.visualization.api import IMediaItemVisualizer
 from telemeta.visualization.octave_core import OctaveCoreVisualizer
 
-class SpectrogramVisualizer2(OctaveCoreVisualizer):
+class SpectrogramVisualizerOctave(OctaveCoreVisualizer):
     """Octave spectral view visualization driver"""
     
     implements(IMediaItemVisualizer)

diff --git a/telemeta/visualization/waveform_audiolab.py b/telemeta/visualization/waveform_audiolab.py
index 91320022059b366968ea6162af5b15b3496ea8ab..6dbe77b7f65ea9c36314b70c6b1d032c61b366f7 100644 (file)
--- a/telemeta/visualization/waveform_audiolab.py
+++ b/telemeta/visualization/waveform_audiolab.py
@@ -13,7 +13,7 @@ from django.conf import settings
 from tempfile import NamedTemporaryFile
 from telemeta.visualization.wav2png import *
 
-class WaveFormVisualizer(Component):
+class WaveFormVisualizerAudiolab(Component):
     """WaveForm visualization driver (python style thanks to wav2png.py and scikits.audiolab)"""
 
     implements(IMediaItemVisualizer)