From 5f9d77c9a04cb6201c165c7922d529a588f6e8ce Mon Sep 17 00:00:00 2001 From: yomguy <> Date: Wed, 31 Dec 2008 17:01:27 +0000 Subject: [PATCH] rename and reorganize visualizers --- telemeta/visualization/__init__.py | 11 +++-------- telemeta/visualization/octave_core.py | 2 +- telemeta/visualization/{ => old}/spectrogram.py | 0 telemeta/visualization/{ => old}/spectrogram3.py | 0 telemeta/visualization/{ => old}/waveform.py | 4 ++-- telemeta/visualization/{ => old}/waveform2.py | 6 ++++-- telemeta/visualization/{ => old}/waveform4.py | 0 .../{spectrogram4.py => spectrogram_audiolab.py} | 12 ++++++------ .../{spectrogram2.py => spectrogram_octave.py} | 7 ++++--- .../{waveform3.py => waveform_audiolab.py} | 8 ++++---- telemeta/web/base.py | 2 +- 11 files changed, 25 insertions(+), 27 deletions(-) rename telemeta/visualization/{ => old}/spectrogram.py (100%) rename telemeta/visualization/{ => old}/spectrogram3.py (100%) rename telemeta/visualization/{ => old}/waveform.py (95%) rename telemeta/visualization/{ => old}/waveform2.py (92%) rename telemeta/visualization/{ => old}/waveform4.py (100%) rename telemeta/visualization/{spectrogram4.py => spectrogram_audiolab.py} (84%) rename telemeta/visualization/{spectrogram2.py => spectrogram_octave.py} (92%) rename telemeta/visualization/{waveform3.py => waveform_audiolab.py} (89%) diff --git a/telemeta/visualization/__init__.py b/telemeta/visualization/__init__.py index 06d036b3..7b46c19a 100644 --- a/telemeta/visualization/__init__.py +++ b/telemeta/visualization/__init__.py @@ -1,9 +1,4 @@ from telemeta.visualization.api import * -#from telemeta.visualization.waveform import * -#from telemeta.visualization.waveform2 import * -from telemeta.visualization.waveform3 import * -#from telemeta.visualization.spectrogram import * -from telemeta.visualization.spectrogram2 import * -from telemeta.visualization.spectrogram3 import * -from telemeta.visualization.waveform4 import * -from telemeta.visualization.spectrogram4 import * \ No newline at end of file +from telemeta.visualization.waveform_audiolab import * +from telemeta.visualization.spectrogram_audiolab import * +from telemeta.visualization.spectrogram_octave import * diff --git a/telemeta/visualization/octave_core.py b/telemeta/visualization/octave_core.py index 9109d43d..13fc15e6 100644 --- a/telemeta/visualization/octave_core.py +++ b/telemeta/visualization/octave_core.py @@ -60,7 +60,7 @@ class OctaveCoreVisualizer(Component): ' -scale x250 ' + self.pngFile.name) # Stream - while True : + while True: buffer = self.pngFile.read(self.buffer_size) if len(buffer) == 0: break diff --git a/telemeta/visualization/spectrogram.py b/telemeta/visualization/old/spectrogram.py similarity index 100% rename from telemeta/visualization/spectrogram.py rename to telemeta/visualization/old/spectrogram.py diff --git a/telemeta/visualization/spectrogram3.py b/telemeta/visualization/old/spectrogram3.py similarity index 100% rename from telemeta/visualization/spectrogram3.py rename to telemeta/visualization/old/spectrogram3.py diff --git a/telemeta/visualization/waveform.py b/telemeta/visualization/old/waveform.py similarity index 95% rename from telemeta/visualization/waveform.py rename to telemeta/visualization/old/waveform.py index 5868c23c..c645c5ef 100644 --- a/telemeta/visualization/waveform.py +++ b/telemeta/visualization/old/waveform.py @@ -23,10 +23,10 @@ class WaveFormVisualizer(Component): # http://jokosher.python-hosting.com/file/jokosher-extra/Waveform.py def get_id(self): - return "waveform" + return "waveform_first" def get_name(self): - return "Waveform" + return "Waveform (wav2png.c)" def set_colors(self, background=None, scheme=None): pass diff --git a/telemeta/visualization/waveform2.py b/telemeta/visualization/old/waveform2.py similarity index 92% rename from telemeta/visualization/waveform2.py rename to telemeta/visualization/old/waveform2.py index 5c4ff9a1..83a67aa6 100644 --- a/telemeta/visualization/waveform2.py +++ b/telemeta/visualization/old/waveform2.py @@ -23,7 +23,7 @@ class WaveformVisualizer2(OctaveCoreVisualizer): self.trans_type = 'png' def get_id(self): - return "waveform2" + return "waveform_octave" def get_name(self): return "Waveform (octave)" @@ -35,5 +35,7 @@ class WaveformVisualizer2(OctaveCoreVisualizer): """Generator that streams the temporal view as a PNG image""" stream = self.octave_to_png_stream(media_item) - return stream + for chunk in stream: + yield chunk + diff --git a/telemeta/visualization/waveform4.py b/telemeta/visualization/old/waveform4.py similarity index 100% rename from telemeta/visualization/waveform4.py rename to telemeta/visualization/old/waveform4.py diff --git a/telemeta/visualization/spectrogram4.py b/telemeta/visualization/spectrogram_audiolab.py similarity index 84% rename from telemeta/visualization/spectrogram4.py rename to telemeta/visualization/spectrogram_audiolab.py index 87e68740..c86106d3 100644 --- a/telemeta/visualization/spectrogram4.py +++ b/telemeta/visualization/spectrogram_audiolab.py @@ -13,8 +13,8 @@ from django.conf import settings from tempfile import NamedTemporaryFile from telemeta.visualization.wav2png import * -class SpectrogramVisualizer3(Component): - """Spectrogram visualization driver (python style)""" +class SpectrogramVisualizerAudiolab(Component): + """Spectrogram visualization driver (python style thanks to wav2png.py and scikits.audiolab)""" implements(IMediaItemVisualizer) @@ -22,10 +22,10 @@ class SpectrogramVisualizer3(Component): color_scheme = None def get_id(self): - return "spectrogram4" + return "spectrogram_audiolab" def get_name(self): - return "Spectrogram (audiolab large)" + return "Spectrogram (audiolab)" def set_colors(self, background=None, scheme=None): self.bg_color = background @@ -40,11 +40,11 @@ class SpectrogramVisualizer3(Component): if not width == None: image_width = width else: - image_width = 1800 + image_width = 1500 if not height == None: image_height = height else: - image_height = 300 + image_height = 200 fft_size = 2048 args = (wav_file, pngFile.name, image_width, image_height, fft_size, diff --git a/telemeta/visualization/spectrogram2.py b/telemeta/visualization/spectrogram_octave.py similarity index 92% rename from telemeta/visualization/spectrogram2.py rename to telemeta/visualization/spectrogram_octave.py index d4c41e98..b130e01f 100644 --- a/telemeta/visualization/spectrogram2.py +++ b/telemeta/visualization/spectrogram_octave.py @@ -21,7 +21,7 @@ class SpectrogramVisualizer2(OctaveCoreVisualizer): self.set_m_file('spectrogram2img.m') def get_id(self): - return "spectrogram2" + return "spectrogram_octave" def get_name(self): return "Spectrogram (octave)" @@ -33,5 +33,6 @@ class SpectrogramVisualizer2(OctaveCoreVisualizer): """Generator that streams the spectral view as a PNG image""" stream = self.octave_to_png_stream(media_item) - return stream - + for chunk in stream: + yield chunk + diff --git a/telemeta/visualization/waveform3.py b/telemeta/visualization/waveform_audiolab.py similarity index 89% rename from telemeta/visualization/waveform3.py rename to telemeta/visualization/waveform_audiolab.py index f6a111e6..91320022 100644 --- a/telemeta/visualization/waveform3.py +++ b/telemeta/visualization/waveform_audiolab.py @@ -14,7 +14,7 @@ from tempfile import NamedTemporaryFile from telemeta.visualization.wav2png import * class WaveFormVisualizer(Component): - """WaveForm visualization driver (python style)""" + """WaveForm visualization driver (python style thanks to wav2png.py and scikits.audiolab)""" implements(IMediaItemVisualizer) @@ -22,7 +22,7 @@ class WaveFormVisualizer(Component): color_scheme = None def get_id(self): - return "waveform3" + return "waveform_audiolab" def get_name(self): return "Waveform (audiolab)" @@ -40,11 +40,11 @@ class WaveFormVisualizer(Component): if not width == None: image_width = width else: - image_width = 305 + image_width = 1500 if not height == None: image_height = height else: - image_height = 150 + image_height = 200 fft_size = 2048 args = (wav_file, pngFile.name, image_width, image_height, fft_size, diff --git a/telemeta/web/base.py b/telemeta/web/base.py index 9aa2604f..bfbeb92a 100644 --- a/telemeta/web/base.py +++ b/telemeta/web/base.py @@ -57,7 +57,7 @@ class WebView(Component): if request.REQUEST.has_key('visualizer_id'): visualizer_id = request.REQUEST['visualizer_id'] else: - visualizer_id = 'waveform3' + visualizer_id = 'waveform_audiolab' analyzers = [] for analyzer in self.analyzers: -- 2.39.5