From bb098ac349c50bdc518c21affe9febc391b0c1b8 Mon Sep 17 00:00:00 2001 From: Thomas Fillon Date: Wed, 14 Jan 2015 13:32:59 +0100 Subject: [PATCH] Fix import path after moving tools submodule --- doc/source/intro.rst | 10 +++++----- doc/source/tutorial/Streaming.rst | 2 +- doc/source/tutorial/frames_stack.rst | 2 +- doc/source/tutorial/quick_start.rst | 6 +++--- tests/test_analyzer_dc.py | 2 +- tests/test_analyzer_level.py | 2 +- tests/test_analyzers_default.py | 2 +- tests/test_aubio_melenergy.py | 2 +- tests/test_aubio_mfcc.py | 2 +- tests/test_aubio_pitch.py | 2 +- tests/test_aubio_specdesc.py | 2 +- tests/test_aubio_temporal.py | 2 +- tests/test_core_processors.py | 2 +- tests/test_decoder_utils.py | 2 +- tests/test_decoding.py | 2 +- tests/test_decoding_stack.py | 2 +- tests/test_graphers_render_analyzers.py | 2 +- tests/test_graphing.py | 2 +- tests/test_process_pipe.py | 2 +- tests/test_run_all_doctests.py | 2 +- tests/test_tools_parameters.py | 4 ++-- tests/test_transcoding.py | 2 +- tests/test_transcoding_streaming.py | 2 +- tests/test_vamp_simple_host.py | 2 +- tests/test_yaafe.py | 2 +- timeside/core/__init__.py | 2 +- timeside/core/analyzer.py | 2 +- timeside/core/encoder.py | 5 ++--- timeside/core/processor.py | 2 +- timeside/core/tools/package.py | 3 +-- timeside/plugins/analyzer/externals/aubio_pitch.py | 2 +- timeside/plugins/analyzer/externals/vamp_plugin.py | 2 +- timeside/plugins/analyzer/externals/yaafe.py | 4 ++-- timeside/plugins/analyzer/level.py | 2 +- timeside/plugins/analyzer/odf.py | 2 +- timeside/plugins/analyzer/spectrogram.py | 8 ++++---- timeside/plugins/analyzer/spectrogram_buffer.py | 8 ++++---- timeside/plugins/decoder/file.py | 6 +++--- timeside/plugins/decoder/live.py | 2 +- timeside/plugins/decoder/utils.py | 2 +- timeside/plugins/encoder/audiosink.py | 2 +- 41 files changed, 58 insertions(+), 60 deletions(-) diff --git a/doc/source/intro.rst b/doc/source/intro.rst index 0f09df9..0ce1eea 100644 --- a/doc/source/intro.rst +++ b/doc/source/intro.rst @@ -60,7 +60,7 @@ Dive in To list all available plugins: -.. doctest:: +.. doctest:: >>> import timeside >>> timeside.core.list_processors() # doctest: +SKIP @@ -73,7 +73,7 @@ Define some processors: .. doctest:: >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> wavfile = samples['sweep.wav'] >>> decoder = get_processor('file_decoder')(wavfile) >>> grapher = get_processor('waveform_simple')() @@ -82,19 +82,19 @@ Define some processors: Then run the *magic* pipeline: -.. doctest:: +.. doctest:: >>> (decoder | grapher | analyzer | encoder).run() Render the grapher results: -.. doctest:: +.. doctest:: >>> grapher.render(output='waveform.png') Show the analyzer results: -.. doctest:: +.. doctest:: >>> print 'Level:', analyzer.results # doctest: +ELLIPSIS Level: {'level.max': AnalyzerResult(...)} diff --git a/doc/source/tutorial/Streaming.rst b/doc/source/tutorial/Streaming.rst index 0826ace..d404390 100644 --- a/doc/source/tutorial/Streaming.rst +++ b/doc/source/tutorial/Streaming.rst @@ -8,7 +8,7 @@ Instead of calling a pipe.run(), the chunks of an encoding processor can also be >>> import timeside >>> from timeside.core import get_processor ->>> from timeside.tools.test_samples import samples +>>> from timeside.core.tools.test_samples import samples >>> import numpy as np >>> audio_file = samples['sweep.wav'] >>> decoder = get_processor('file_decoder')(audio_file, duration=1) diff --git a/doc/source/tutorial/frames_stack.rst b/doc/source/tutorial/frames_stack.rst index 39075ae..6314220 100644 --- a/doc/source/tutorial/frames_stack.rst +++ b/doc/source/tutorial/frames_stack.rst @@ -11,7 +11,7 @@ First, let's import everything and define the audio file source : >>> import timeside.core >>> from timeside.core import get_processor ->>> from timeside.tools.test_samples import samples +>>> from timeside.core.tools.test_samples import samples >>> import numpy as np >>> audio_file = samples['sweep.mp3'] diff --git a/doc/source/tutorial/quick_start.rst b/doc/source/tutorial/quick_start.rst index 93bf195..a811b05 100644 --- a/doc/source/tutorial/quick_start.rst +++ b/doc/source/tutorial/quick_start.rst @@ -20,7 +20,7 @@ A most basic operation, transcoding, is easily performed with two processors: .. doctest:: test_1 >>> import timeside - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> from timeside.core import get_processor >>> decoder = get_processor('file_decoder')(samples["sweep.wav"]) >>> encoder = get_processor('vorbis_encoder')("sweep.ogg") @@ -36,7 +36,7 @@ Spectrogram. All graphers return an image: .. doctest:: test_2 >>> import timeside - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> from timeside.core import get_processor >>> decoder = get_processor('file_decoder')(samples["sweep.wav"]) >>> spectrogram = get_processor('spectrogram_lin')(width=400, height=150) @@ -49,7 +49,7 @@ analysis and encoding: .. doctest:: test_3 >>> import timeside - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> from timeside.core import get_processor >>> decoder = get_processor('file_decoder')(samples["sweep.wav"]) >>> levels = get_processor('level')() diff --git a/tests/test_analyzer_dc.py b/tests/test_analyzer_dc.py index 44595af..492863b 100755 --- a/tests/test_analyzer_dc.py +++ b/tests/test_analyzer_dc.py @@ -3,7 +3,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder from timeside.plugins.analyzer.dc import MeanDCShift -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples class TestAnalyzerDC(unittest.TestCase): diff --git a/tests/test_analyzer_level.py b/tests/test_analyzer_level.py index f63ef2d..76ef3e2 100755 --- a/tests/test_analyzer_level.py +++ b/tests/test_analyzer_level.py @@ -3,7 +3,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder from timeside.plugins.analyzer.level import Level -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples class TestAnalyzerLevel(unittest.TestCase): diff --git a/tests/test_analyzers_default.py b/tests/test_analyzers_default.py index 9a462ae..1a65ba4 100755 --- a/tests/test_analyzers_default.py +++ b/tests/test_analyzers_default.py @@ -6,7 +6,7 @@ import numpy as np import timeside.core from timeside.plugins.decoder.file import FileDecoder -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples diff --git a/tests/test_aubio_melenergy.py b/tests/test_aubio_melenergy.py index fcda599..b4ad9a0 100755 --- a/tests/test_aubio_melenergy.py +++ b/tests/test_aubio_melenergy.py @@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_AUBIO -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available') diff --git a/tests/test_aubio_mfcc.py b/tests/test_aubio_mfcc.py index 1555b6c..4befba5 100755 --- a/tests/test_aubio_mfcc.py +++ b/tests/test_aubio_mfcc.py @@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_AUBIO -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available') diff --git a/tests/test_aubio_pitch.py b/tests/test_aubio_pitch.py index ddf526c..fd7404f 100755 --- a/tests/test_aubio_pitch.py +++ b/tests/test_aubio_pitch.py @@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_AUBIO -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available') diff --git a/tests/test_aubio_specdesc.py b/tests/test_aubio_specdesc.py index 6378a6f..c36440f 100755 --- a/tests/test_aubio_specdesc.py +++ b/tests/test_aubio_specdesc.py @@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_AUBIO -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available') diff --git a/tests/test_aubio_temporal.py b/tests/test_aubio_temporal.py index fc88530..8ab57db 100755 --- a/tests/test_aubio_temporal.py +++ b/tests/test_aubio_temporal.py @@ -5,7 +5,7 @@ from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_AUBIO -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_AUBIO, 'Aubio library is not available') diff --git a/tests/test_core_processors.py b/tests/test_core_processors.py index 5983581..7cf005d 100644 --- a/tests/test_core_processors.py +++ b/tests/test_core_processors.py @@ -8,7 +8,7 @@ from timeside.core.processor import Processor from timeside.core.api import IProcessor from timeside.core.component import implements, interfacedoc -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples SAMPLE_RATE_FORCED = 16000 OTHER_SAMPLE_RATE = 32000 diff --git a/tests/test_decoder_utils.py b/tests/test_decoder_utils.py index c0cac0c..adf7d9c 100755 --- a/tests/test_decoder_utils.py +++ b/tests/test_decoder_utils.py @@ -6,7 +6,7 @@ from __future__ import division from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.utils import get_uri, get_media_uri_info, path2uri -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples import os.path diff --git a/tests/test_decoding.py b/tests/test_decoding.py index ac217b8..04ec818 100755 --- a/tests/test_decoding.py +++ b/tests/test_decoding.py @@ -6,7 +6,7 @@ from timeside.plugins.decoder.file import FileDecoder from timeside.core.processor import ProcessPipe from unit_timeside import unittest, TestRunner -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples import os.path diff --git a/tests/test_decoding_stack.py b/tests/test_decoding_stack.py index 7a917bf..3ec8f6b 100755 --- a/tests/test_decoding_stack.py +++ b/tests/test_decoding_stack.py @@ -6,7 +6,7 @@ from timeside.plugins.decoder.file import FileDecoder from timeside.plugins.analyzer.level import Level from timeside.core.processor import ProcessPipe from unit_timeside import unittest, TestRunner -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples #from glib import GError as GST_IOError # HINT : to use later with Gnonlin only diff --git a/tests/test_graphers_render_analyzers.py b/tests/test_graphers_render_analyzers.py index f49d3c5..7390e01 100755 --- a/tests/test_graphers_render_analyzers.py +++ b/tests/test_graphers_render_analyzers.py @@ -3,7 +3,7 @@ from __future__ import division from unit_timeside import unittest, TestRunner import timeside -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples from tempfile import NamedTemporaryFile import os diff --git a/tests/test_graphing.py b/tests/test_graphing.py index 2d26869..d04fae6 100755 --- a/tests/test_graphing.py +++ b/tests/test_graphing.py @@ -2,7 +2,7 @@ from timeside.plugins.decoder.file import FileDecoder from unit_timeside import unittest, TestRunner -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples import tempfile import os.path diff --git a/tests/test_process_pipe.py b/tests/test_process_pipe.py index df38147..ed2ef8d 100755 --- a/tests/test_process_pipe.py +++ b/tests/test_process_pipe.py @@ -6,7 +6,7 @@ from unit_timeside import unittest, TestRunner import timeside from timeside.plugins.decoder.file import FileDecoder -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples class TestProcessPipe(unittest.TestCase): diff --git a/tests/test_run_all_doctests.py b/tests/test_run_all_doctests.py index aef1a8a..d7a96be 100755 --- a/tests/test_run_all_doctests.py +++ b/tests/test_run_all_doctests.py @@ -24,7 +24,7 @@ import unittest from unit_timeside import TestRunner import doctest import timeside -from timeside.tools.package import discover_modules +from timeside.core.tools.package import discover_modules def load_tests(loader, tests, ignore): diff --git a/tests/test_tools_parameters.py b/tests/test_tools_parameters.py index 40552aa..4085ff4 100755 --- a/tests/test_tools_parameters.py +++ b/tests/test_tools_parameters.py @@ -2,8 +2,8 @@ # -*- coding: utf-8 -*- from unit_timeside import unittest, TestRunner -from timeside.tools.parameters import HasParam, HasTraits -from timeside.tools.parameters import Unicode, Int, Float, Range +from timeside.core.tools.parameters import HasParam, HasTraits +from timeside.core.tools.parameters import Unicode, Int, Float, Range import simplejson as json diff --git a/tests/test_transcoding.py b/tests/test_transcoding.py index 7dcda20..0de5413 100755 --- a/tests/test_transcoding.py +++ b/tests/test_transcoding.py @@ -8,7 +8,7 @@ from timeside.plugins.decoder.file import FileDecoder import os from unit_timeside import unittest, TestRunner from tools import tmp_file_sink -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples class TestTranscodingFromWav(unittest.TestCase): diff --git a/tests/test_transcoding_streaming.py b/tests/test_transcoding_streaming.py index e3e614c..dc42bb7 100755 --- a/tests/test_transcoding_streaming.py +++ b/tests/test_transcoding_streaming.py @@ -7,7 +7,7 @@ from timeside.plugins.decoder.file import FileDecoder from unit_timeside import unittest, TestRunner from tools import tmp_file_sink -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples class TestTranscodingStreaming(unittest.TestCase): diff --git a/tests/test_vamp_simple_host.py b/tests/test_vamp_simple_host.py index b78580b..78dfdc9 100755 --- a/tests/test_vamp_simple_host.py +++ b/tests/test_vamp_simple_host.py @@ -4,7 +4,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder from timeside.core import get_processor from timeside.core import _WITH_VAMP -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples @unittest.skipIf(not _WITH_VAMP, 'vamp-simple-host library is not available') diff --git a/tests/test_yaafe.py b/tests/test_yaafe.py index f9fe440..bdda26d 100755 --- a/tests/test_yaafe.py +++ b/tests/test_yaafe.py @@ -2,7 +2,7 @@ from unit_timeside import unittest, TestRunner from timeside.plugins.decoder.file import FileDecoder -from timeside.tools.test_samples import samples +from timeside.core.tools.test_samples import samples from timeside.core import _WITH_YAAFE if _WITH_YAAFE: diff --git a/timeside/core/__init__.py b/timeside/core/__init__.py index 364a300..41f35a9 100644 --- a/timeside/core/__init__.py +++ b/timeside/core/__init__.py @@ -30,7 +30,7 @@ from .component import implements, interfacedoc, abstract __version__ = '0.6.2' -from ..tools import package as ts_package +from .tools import package as ts_package # Check Availability of Gstreamer python bindings ts_package.check_gstreamer() diff --git a/timeside/core/analyzer.py b/timeside/core/analyzer.py index f5e6a86..f9de7a5 100644 --- a/timeside/core/analyzer.py +++ b/timeside/core/analyzer.py @@ -25,7 +25,7 @@ from __future__ import division from .processor import Processor -from ..tools import hdf5 +from .tools import hdf5 import timeside # import __version__ from timeside.core import implements, interfacedoc, abstract diff --git a/timeside/core/encoder.py b/timeside/core/encoder.py index 843a536..aed5338 100644 --- a/timeside/core/encoder.py +++ b/timeside/core/encoder.py @@ -22,10 +22,9 @@ # along with TimeSide. If not, see . -from timeside.core import Processor, implements, interfacedoc -from ..core import abstract +from timeside.core import Processor, implements, interfacedoc, abstract from timeside.core.api import IEncoder -from timeside.tools.gstutils import numpy_array_to_gst_buffer, MainloopThread +from .tools.gstutils import numpy_array_to_gst_buffer, MainloopThread import pygst pygst.require('0.10') diff --git a/timeside/core/processor.py b/timeside/core/processor.py index 8c6efb3..1ce10a2 100644 --- a/timeside/core/processor.py +++ b/timeside/core/processor.py @@ -22,7 +22,7 @@ from .component import Component, MetaComponent, abstract from .component import implements, implementations, interfacedoc from .api import IProcessor from .exceptions import Error, PIDError, ApiError -from ..tools.parameters import HasParam +from .tools.parameters import HasParam import re import numpy diff --git a/timeside/core/tools/package.py b/timeside/core/tools/package.py index a31b887..48adab9 100644 --- a/timeside/core/tools/package.py +++ b/timeside/core/tools/package.py @@ -23,7 +23,7 @@ from importlib import import_module import warnings -from ..core.exceptions import VampImportError +from ..exceptions import VampImportError def discover_modules(subpackage, package=None): import pkgutil @@ -114,7 +114,6 @@ def check_yaafe(): def check_vamp(): "Check Vamp host availability" - from ..core.exceptions import VampImportError try: from timeside.plugins.analyzer.externals import vamp_plugin diff --git a/timeside/plugins/analyzer/externals/aubio_pitch.py b/timeside/plugins/analyzer/externals/aubio_pitch.py index 1c5488c..e09d8bd 100644 --- a/timeside/plugins/analyzer/externals/aubio_pitch.py +++ b/timeside/plugins/analyzer/externals/aubio_pitch.py @@ -28,7 +28,7 @@ from aubio import pitch import numpy as np from timeside.plugins.analyzer.utils import nextpow2 -from timeside.tools.parameters import Float, HasTraits +from timeside.core.tools.parameters import Float, HasTraits class AubioPitch(Analyzer): diff --git a/timeside/plugins/analyzer/externals/vamp_plugin.py b/timeside/plugins/analyzer/externals/vamp_plugin.py index ebd2839..4e12c78 100644 --- a/timeside/plugins/analyzer/externals/vamp_plugin.py +++ b/timeside/plugins/analyzer/externals/vamp_plugin.py @@ -22,7 +22,7 @@ from timeside.core import implements, interfacedoc from timeside.core.analyzer import Analyzer from timeside.core.api import IAnalyzer -from timeside.tools.parameters import HasTraits, List +from timeside.core.tools.parameters import HasTraits, List import subprocess import tempfile diff --git a/timeside/plugins/analyzer/externals/yaafe.py b/timeside/plugins/analyzer/externals/yaafe.py index 76ab7f4..803a57e 100644 --- a/timeside/plugins/analyzer/externals/yaafe.py +++ b/timeside/plugins/analyzer/externals/yaafe.py @@ -29,7 +29,7 @@ from timeside.core.api import IAnalyzer import yaafelib import numpy from timeside.core.preprocessors import downmix_to_mono -from timeside.tools.parameters import HasTraits, ListUnicode, Float +from timeside.core.tools.parameters import HasTraits, ListUnicode, Float class Yaafe(Analyzer): @@ -46,7 +46,7 @@ class Yaafe(Analyzer): Examples -------- >>> import timeside - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> from timeside.core import get_processor >>> source = samples['C4_scale.wav'] >>> FileDecoder = get_processor('file_decoder') diff --git a/timeside/plugins/analyzer/level.py b/timeside/plugins/analyzer/level.py index b2686c0..7806926 100644 --- a/timeside/plugins/analyzer/level.py +++ b/timeside/plugins/analyzer/level.py @@ -36,7 +36,7 @@ class Level(Analyzer): >>> import timeside >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> source = samples['sweep.mp3'] >>> decoder = get_processor('file_decoder')(uri=source) >>> level = get_processor('level')() diff --git a/timeside/plugins/analyzer/odf.py b/timeside/plugins/analyzer/odf.py index 4b02798..423bb10 100644 --- a/timeside/plugins/analyzer/odf.py +++ b/timeside/plugins/analyzer/odf.py @@ -26,7 +26,7 @@ from timeside.core.api import IAnalyzer import numpy as np from numpy import pi as Pi from scipy import signal -from timeside.tools.parameters import Int, HasTraits +from timeside.core.tools.parameters import Int, HasTraits class OnsetDetectionFunction(Analyzer): diff --git a/timeside/plugins/analyzer/spectrogram.py b/timeside/plugins/analyzer/spectrogram.py index 925e30f..ee55b6f 100644 --- a/timeside/plugins/analyzer/spectrogram.py +++ b/timeside/plugins/analyzer/spectrogram.py @@ -23,8 +23,8 @@ from timeside.core import implements, interfacedoc from timeside.core.analyzer import Analyzer from timeside.core.api import IAnalyzer from timeside.core.preprocessors import downmix_to_mono, frames_adapter -from timeside.tools.buffering import BufferTable -from timeside.tools.parameters import Int, HasTraits +from timeside.core.tools.buffering import BufferTable +from timeside.core.tools.parameters import Int, HasTraits import numpy as np @@ -47,7 +47,7 @@ class Spectrogram(Analyzer): -------- >>> import timeside >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> audio_source = samples['sweep.wav'] >>> decoder = get_processor('file_decoder')(uri=audio_source) >>> spectrogram = get_processor('spectrogram_analyzer')(input_blocksize=2048, input_stepsize=1024) @@ -63,7 +63,7 @@ class Spectrogram(Analyzer): import timeside from timeside.core import get_processor - from timeside.tools.test_samples import samples + from timeside.core.tools.test_samples import samples audio_source = samples['sweep.wav'] decoder = get_processor('file_decoder')(uri=audio_source) spectrogram = get_processor('spectrogram_analyzer')(input_blocksize=2048, diff --git a/timeside/plugins/analyzer/spectrogram_buffer.py b/timeside/plugins/analyzer/spectrogram_buffer.py index 0b8a135..1923d61 100644 --- a/timeside/plugins/analyzer/spectrogram_buffer.py +++ b/timeside/plugins/analyzer/spectrogram_buffer.py @@ -25,8 +25,8 @@ from timeside.core import implements, interfacedoc from timeside.core.analyzer import Analyzer from timeside.core.api import IAnalyzer from timeside.core.preprocessors import downmix_to_mono, frames_adapter -from timeside.tools.parameters import Int, HasTraits -from timeside.tools.buffering import BufferTable +from timeside.core.tools.parameters import Int, HasTraits +from timeside.core.tools.buffering import BufferTable from timeside.plugins.analyzer.spectrogram import Spectrogram import numpy as np @@ -49,7 +49,7 @@ class SpectrogramBuffer(Spectrogram): -------- >>> import timeside >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> audio_source = samples['sweep.wav'] >>> decoder = get_processor('file_decoder')(uri=audio_source) >>> spectrogram = get_processor('spectrogram_analyzer_buffer')(input_blocksize=2048, input_stepsize=1024) @@ -65,7 +65,7 @@ class SpectrogramBuffer(Spectrogram): import timeside from timeside.core import get_processor - from timeside.tools.test_samples import samples + from timeside.core.tools.test_samples import samples audio_source = samples['sweep.wav'] decoder = get_processor('file_decoder')(uri=audio_source) spectrogram = get_processor('spectrogram_analyzer_buffer')(input_blocksize=2048, diff --git a/timeside/plugins/decoder/file.py b/timeside/plugins/decoder/file.py index 3659911..3cd21d3 100644 --- a/timeside/plugins/decoder/file.py +++ b/timeside/plugins/decoder/file.py @@ -31,8 +31,8 @@ from __future__ import division from timeside.core.decoder import Decoder, IDecoder, implements, interfacedoc -from timeside.tools.gstutils import MainloopThread, gobject -from timeside.tools.gstutils import gst_buffer_to_numpy_array +from timeside.core.tools.gstutils import MainloopThread, gobject +from timeside.core.tools.gstutils import gst_buffer_to_numpy_array import threading from timeside.plugins.decoder.utils import get_uri, get_media_uri_info, stack, get_sha1 @@ -67,7 +67,7 @@ class FileDecoder(Decoder): -------- >>> import timeside >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> audio_source = samples['sweep.wav'] >>> FileDecoder = get_processor('file_decoder') # Get the decoder class >>> # Use decoder with default parameters diff --git a/timeside/plugins/decoder/live.py b/timeside/plugins/decoder/live.py index ee97232..dbff592 100644 --- a/timeside/plugins/decoder/live.py +++ b/timeside/plugins/decoder/live.py @@ -29,7 +29,7 @@ from __future__ import division from timeside.core.decoder import Decoder, IDecoder, interfacedoc, implements -from timeside.tools.gstutils import MainloopThread, gobject +from timeside.core.tools.gstutils import MainloopThread, gobject from timeside.plugins.decoder.file import FileDecoder import Queue import threading diff --git a/timeside/plugins/decoder/utils.py b/timeside/plugins/decoder/utils.py index b021f13..3468636 100644 --- a/timeside/plugins/decoder/utils.py +++ b/timeside/plugins/decoder/utils.py @@ -181,7 +181,7 @@ def sha1sum_file(filename): ''' Return the secure hash digest with sha1 algorithm for a given file - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> wav_file = samples["C4_scale.wav"] >>> print sha1sum_file(wav_file) a598e78d0b5c90da54a77e34c083abdcd38d42ba diff --git a/timeside/plugins/encoder/audiosink.py b/timeside/plugins/encoder/audiosink.py index 3b3c9e6..9bf4cc7 100644 --- a/timeside/plugins/encoder/audiosink.py +++ b/timeside/plugins/encoder/audiosink.py @@ -47,7 +47,7 @@ class AudioSink(GstEncoder): >>> import timeside >>> from timeside.core import get_processor - >>> from timeside.tools.test_samples import samples + >>> from timeside.core.tools.test_samples import samples >>> wav_file = samples['sine440Hz_mono_1s.wav'] >>> d = get_processor('file_decoder')(wav_file) >>> e = get_processor('live_encoder')() -- 2.39.5