Changeset 09b1777

Timestamp:

Oct 21, 2009, 3:40:23 PM (15 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:

3ad2ef6

Parents:

1f8e522

Message:

gen_pyobject.py: fix initialisation of strings and tempo output size

File:

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

interfaces/python/gen_pyobject.py

@@ -41 +41 @@
     'mfcc':         ('self->n_coeffs', 'in->channels'),
     'beattracking': ('self->winlen', 'self->channels'),
-    'tempo':        ('self->buf_size', 'self->channels'),
+    'tempo':        ('1', 'self->channels'),
     'peakpicker':   ('1', 'self->channels'),
 }
@@ -147 +147 @@
 """ % locals()
     for ptype, pname in newparams:
-        defval = aubioinitvalue[ptype]
+        initval = aubioinitvalue[ptype]
         s += """\
-  %(ptype)s %(pname)s = %(defval)s;
-""" % locals()
+  %(ptype)s %(pname)s = %(initval)s;
+""" % locals()
+    # now the actual PyArg_Parse
     s += """\
   Py_%(name)s *self;
@@ -169 +170 @@
     for ptype, pname in newparams:
         defval = aubiodefvalue[pname]
-        s += """\
+        if ptype == 'char_t*':
+            s += """\
+
+  self->%(pname)s = %(defval)s;
+  if (%(pname)s != NULL) {
+    self->%(pname)s = %(pname)s;
+  }
+""" % locals()
+        elif ptype == 'uint_t':
+            s += """\
 
   self->%(pname)s = %(defval)s;
@@ -176 +186 @@
   } else if (%(pname)s < 0) {
     PyErr_SetString (PyExc_ValueError,
-        "can not use negative window size");
-    return NULL;
-  }
-""" % locals()
+        "can not use negative value for %(pname)s");
+    return NULL;
+  }
+""" % locals()
+        elif ptype == 'smpl_t':
+            s += """\
+
+  self->%(pname)s = %(defval)s;
+  if (%(pname)s != %(defval)s) {
+    self->%(pname)s = %(pname)s;
+  }
+""" % locals()
+        else:
+            print "ERROR, unknown type of parameter %s %s" % (ptype, pname)
     s += """\
 
@@ -280 +300 @@
 AUBIO_MEMBERS_START(%(name)s)""" % locals()
     for param in newparams:
-        s += """
+        if param[0] == 'char_t*':
+            s += """
+  {"%(pname)s", T_STRING, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
+        % { 'pname': param[1], 'ptype': param[0], 'name': name}
+        elif param[0] == 'uint_t':
+            s += """
   {"%(pname)s", T_INT, offsetof (Py_%(name)s, %(pname)s), READONLY, ""},""" \
         % { 'pname': param[1], 'ptype': param[0], 'name': name}
+        else:
+            print "-- ERROR, unknown member type ", param
     s += """
 AUBIO_MEMBERS_STOP(%(name)s)