Changeset 5c246b0

Timestamp:

Nov 6, 2009, 1:25:13 AM (14 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:

7db3477

Parents:

7c4cf20

Message:

gen_pyobject.py: update, add smpl_t

File:

• interfaces/python/gen_pyobject.py (modified) (5 diffs)

interfaces/python/gen_pyobject.py

@@ -30 +30 @@
 defaultsizes = {
     'resampler':    ('input->length * self->ratio', 'input->channels'),
-    'onsetdetection': ('1', 'self->channels'),
+    'specdesc':     ('1', 'self->channels'),
     'onset':        ('1', 'self->channels'),
     'pitchyin':     ('1', 'in->channels'),
@@ -38 +38 @@
     'pitchfcomb':   ('1', 'self->channels'),
     'pitch':        ('1', 'self->channels'),
-    'tss':          ('self->hop_s', 'self->channels'),
+    'tss':          ('self->hop_size', 'self->channels'),
     'mfcc':         ('self->n_coeffs', 'in->channels'),
-    'beattracking': ('self->winlen', 'self->channels'),
+    'beattracking': ('self->hop_size', 'self->channels'),
     'tempo':        ('1', 'self->channels'),
     'peakpicker':   ('1', 'self->channels'),
@@ -55 +55 @@
 aubiodefvalue = {
     # we have some clean up to do
-    'win_s': 'Py_default_vector_length', 
-    'bufsize': 'Py_default_vector_length', 
     'buf_size': 'Py_default_vector_length', 
-    'winlen': 'Py_default_vector_length', 
     # and here too
-    'hop_s': 'Py_default_vector_length / 2', 
-    'hopsize': 'Py_default_vector_length / 2', 
     'hop_size': 'Py_default_vector_length / 2', 
     # these should be alright
@@ -76 +71 @@
     'thrs': '0.5',
     'ratio': '0.5',
-    'threshold': '0.5',
-    'mode': '"default"',
-    'onset_mode': '"default"',
-    'type': '0',
+    'method': '"default"',
     }
 
@@ -308 +300 @@
   {"%(pname)s", T_INT, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
         % { 'pname': param[1], 'ptype': param[0], 'name': name}
+        elif param[0] == 'smpl_t':
+            s += """
+  {"%(pname)s", T_FLOAT, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
+        % { 'pname': param[1], 'ptype': param[0], 'name': name}
         else:
             print "-- ERROR, unknown member type ", param