Changeset f264b17 for python/lib/aubio/__init__.py

Timestamp:

Jun 22, 2016, 1:00:10 PM (8 years ago)

Author:

Paul Brossier <piem@piem.org>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master, pitchshift, sampler, timestretch, yinfft+

Children:

4b9443c4

Parents:

60fc05b (diff), 6769586 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into notes

File:

• python/lib/aubio/__init__.py (modified) (1 diff)

python/lib/aubio/__init__.py

@@ -2 +2 @@
 
 import numpy
-from _aubio import *
-from midiconv import *
-from slicing import *
+from ._aubio import *
+from ._aubio import float_type
+from .midiconv import *
+from .slicing import *
 
 class fvec(numpy.ndarray):
-    " a simple numpy array holding a vector of float32 "
-    def __new__(self, length = 1024, **kwargs):
-        self.length = length
-        if type(length) == type([]):
-            return numpy.array(length, dtype='float32', **kwargs)
-        return numpy.zeros(length, dtype='float32', **kwargs)
+    """a numpy vector holding audio samples"""
+
+    def __new__(cls, input_arg=1024, **kwargs):
+        if isinstance(input_arg, int):
+            if input_arg == 0:
+                raise ValueError("vector length of 1 or more expected")
+            return numpy.zeros(input_arg, dtype=float_type, **kwargs)
+        else:
+            return numpy.array(input_arg, dtype=float_type, **kwargs)