Changeset d27634d for python

Timestamp:

Dec 10, 2013, 10:13:49 PM (11 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:

2f9af5d

Parents:

d7019c4

Message:

python/ext/py-source.c: not generated, modified init to get samplerate from aubio_source_t

Signed-off-by: Paul Brossier <​piem@piem.org>

Location:

python

Files:

• ext/aubio-types.h (modified) (2 diffs)
• ext/aubiomodule.c (modified) (2 diffs)
• ext/py-source.c (added)
• lib/generator.py (modified) (1 diff)
• setup.py (modified) (1 diff)

python/ext/aubio-types.h

@@ -31 +31 @@
 #define Py_default_vector_length 1024
 
-#define Py_aubio_default_samplerate 44100
+#define Py_aubio_default_samplerate 0
 
 #if HAVE_AUBIO_DOUBLE
@@ -69 +69 @@
 extern PyTypeObject Py_pvocType;
 
+extern PyTypeObject Py_sourceType;
+

python/ext/aubiomodule.c

@@ -199 +199 @@
       || (PyType_Ready (&Py_fftType) < 0)
       || (PyType_Ready (&Py_pvocType) < 0)
+      || (PyType_Ready (&Py_sourceType) < 0)
       // generated objects
       || (generated_types_ready() < 0 )
@@ -227 +228 @@
   Py_INCREF (&Py_pvocType);
   PyModule_AddObject (m, "pvoc", (PyObject *) & Py_pvocType);
+  Py_INCREF (&Py_sourceType);
+  PyModule_AddObject (m, "source", (PyObject *) & Py_sourceType);
 
   // add generated objects

python/lib/generator.py

@@ -57 +57 @@
       'sink_apple_audio',
       'sink_sndfile',
+      'source',
       'source_apple_audio',
       'source_sndfile',

python/setup.py

@@ -54 +54 @@
     "ext/py-fft.c",
     "ext/py-phasevoc.c",
+    "ext/py-source.c",
     # generated files
     ] + generated_object_files,