fix analyze paths

diff --git a/analyze/__init__.py b/analyze/__init__.py
index 0c2c597f738c4689a8e7b41b833a915147686d19..97c5cad5e22bde63e4f41912a90f52004936e6b4 100644 (file)
--- a/analyze/__init__.py
+++ b/analyze/__init__.py
@@ -1,14 +1,14 @@
 # -*- coding: utf-8 -*-
-from timeside.analysis.api import *
-from timeside.analysis.core import *
-from timeside.analysis.channels import *
-from timeside.analysis.format import *
-from timeside.analysis.encoding import *
-from timeside.analysis.resolution import *
-from timeside.analysis.samplerate import *
-from timeside.analysis.duration import *
-from timeside.analysis.max_level import *
-from timeside.analysis.mean_level import *
-from timeside.analysis.dc import *
+from timeside.analyze.api import *
+from timeside.analyze.core import *
+from timeside.analyze.channels import *
+from timeside.analyze.format import *
+from timeside.analyze.encoding import *
+from timeside.analyze.resolution import *
+from timeside.analyze.samplerate import *
+from timeside.analyze.duration import *
+from timeside.analyze.max_level import *
+from timeside.analyze.mean_level import *
+from timeside.analyze.dc import *
 
 

diff --git a/analyze/api.py b/analyze/api.py
index 634ef2a36fb112b1a80400a332a00bf6e68c390a..480412487b0464ae1efeed57f866b9f23d0369f2 100644 (file)
--- a/analyze/api.py
+++ b/analyze/api.py
@@ -28,7 +28,7 @@ class IMediaItemAnalyzer(Interface):
         """Return a short id alphanumeric, lower-case string."""
 
     def get_name():
-        """Return the analysis name, such as "Mean Level", "Max level",
+        """Return the analyze name, such as "Mean Level", "Max level",
         "Total length, etc..
         """
 

diff --git a/analyze/channels.py b/analyze/channels.py
index 5f1c2ee4ea53988c0f9fa75a97cb11d39788ca20..da97d5665a33a0e01d9a2bda9f2a74e020683055 100644 (file)
--- a/analyze/channels.py
+++ b/analyze/channels.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class ChannelAnalyser(AudioProcessor):

diff --git a/analyze/dc.py b/analyze/dc.py
index c15a6f8a018f319e72be1b1a850a968ffe352707..076048e6250f7913d65fb45600eb012c56f0ec5f 100644 (file)
--- a/analyze/dc.py
+++ b/analyze/dc.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class MeanDCShiftAnalyser(AudioProcessor):

diff --git a/analyze/duration.py b/analyze/duration.py
index 9428021cd9c373c55f450e5eaef95430f9627146..b7a0ce170651e620c6d723ba8b611aa51a5f3bc1 100644 (file)
--- a/analyze/duration.py
+++ b/analyze/duration.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 import datetime
 

diff --git a/analyze/encoding.py b/analyze/encoding.py
index 897ff042d9fc667dc133b8a129b91c6df68a1507..a2353f0d36ca25119599ec6076d6cf2c4c53097b 100644 (file)
--- a/analyze/encoding.py
+++ b/analyze/encoding.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class EncodingAnalyser(AudioProcessor):

diff --git a/analyze/format.py b/analyze/format.py
index 480ce0024a1d9d0fca679c9178dc16158e1806f4..aaad5d47724f404c47ca1fb387999fc15e3ef2c6 100644 (file)
--- a/analyze/format.py
+++ b/analyze/format.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class FormatAnalyser(AudioProcessor):

diff --git a/analyze/max_level.py b/analyze/max_level.py
index a54e460ee26594bdc8a7bfb0edd13b6aec8ac445..e1fda358b9a138948f7f14b66b9d4b1cf213afe9 100644 (file)
--- a/analyze/max_level.py
+++ b/analyze/max_level.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class MaxLevelAnalyzer(AudioProcessor):

diff --git a/analyze/mean_level.py b/analyze/mean_level.py
index b7696ed40301dc3ac407c164b992e3f7fc08e56c..991590c0f0166d5ffa4520e1928dfc3731ba0c77 100644 (file)
--- a/analyze/mean_level.py
+++ b/analyze/mean_level.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class MeanLevelAnalyser(AudioProcessor):

diff --git a/analyze/resolution.py b/analyze/resolution.py
index 98c2901c8fa0148789526d4aa3ed4fa7300a40a1..74d985f6d159a13db7b9db27c9d999caf2534719 100644 (file)
--- a/analyze/resolution.py
+++ b/analyze/resolution.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class ResolutionAnalyser(AudioProcessor):

diff --git a/analyze/samplerate.py b/analyze/samplerate.py
index 0970fcb107277bde2b26e830ebee8b0a089c76c5..f6fddf0e8ba3ba733a7d3879f8b469282cdf1355 100644 (file)
--- a/analyze/samplerate.py
+++ b/analyze/samplerate.py
@@ -19,8 +19,8 @@
 
 # Author: Guillaume Pellerin <yomguy@parisson.com>
 
-from timeside.analysis.core import *
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.core import *
+from timeside.analyze.api import IMediaItemAnalyzer
 import numpy
 
 class SampleRateAnalyzer(AudioProcessor):

diff --git a/analyze/vamp/__init__.py b/analyze/vamp/__init__.py
index 1dc0d671c4f1e56ccd4fb8ef9b5e9270dc98857a..d889d34e97130203870caca4f979b0a7f4d9766f 100644 (file)
--- a/analyze/vamp/__init__.py
+++ b/analyze/vamp/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-from timeside.analysis.vamp.core import *
+from timeside.analyze.vamp.core import *

diff --git a/analyze/vamp/core.py b/analyze/vamp/core.py
index bc32def0458df6c53b92bbaa980cbae475357d5f..b75d0abc1b85f8698b40eb1b06558662b78e5e9b 100644 (file)
--- a/analyze/vamp/core.py
+++ b/analyze/vamp/core.py
@@ -21,7 +21,7 @@
 
 from timeside.core import *
 from tempfile import NamedTemporaryFile
-from timeside.analysis.api import IMediaItemAnalyzer
+from timeside.analyze.api import IMediaItemAnalyzer
 import os
 import random
 import subprocess

diff --git a/encode/mp3.py b/encode/mp3.py
index eb1e4160029becaf5b4b8b50775dffe87531d1d6..16b4934b809c92c169542494ddea6c8b732a2641 100644 (file)
--- a/encode/mp3.py
+++ b/encode/mp3.py
@@ -28,7 +28,7 @@ from timeside.encode.core import *
 from timeside.encode.api import IEncoder
 
 
-class Mp3Encoder(EencoderCore):
+class Mp3Encoder(EncoderCore):
     """Defines methods to encode to MP3"""
 
     implements(IEncoder)