Changeset 6500367

Timestamp:

Jul 17, 2012, 12:54:51 AM (12 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:

3ff62e9

Parents:

6fd8d7e

Message:

generator.py, gen_pyobject.py: more hacks for sink

Location:

interfaces/python

Files:

• gen_pyobject.py (modified) (5 diffs)
• generator.py (modified) (1 diff)

interfaces/python/gen_pyobject.py

@@ -21 +21 @@
 param_numbers = {
   'source': [0, 2],
+  'sink':   [2, 0],
 }
 
@@ -145 +146 @@
     'fvec_t*': 'PyAubio_ArrayToCFvec',
     'cvec_t*': 'PyAubio_ArrayToCCvec',
+    'uint_t': '(uint_t)PyInt_AsLong',
 }
 
@@ -153 +155 @@
     'smpl_t': 'PyFloat_FromDouble',
     'uint_t*': 'PyInt_FromLong',
+    'uint_t': 'PyInt_FromLong',
 }
 
@@ -275 +278 @@
     pytypes = "".join([aubio2pytypes[p['type']] for p in inputparams])
 
-    inputdefs = "/* input vectors python prototypes */\n  "
-    inputdefs += "\n  ".join(["PyObject * " + p['name'] + "_obj;" for p in inputparams])
-
-    inputvecs = "/* input vectors prototypes */\n  "
+    inputdefs = "  /* input vectors python prototypes */\n"
+    for p in inputparams:
+      if p['type'] != 'uint_t':
+        inputdefs += "  PyObject * " + p['name'] + "_obj;\n"
+
+    inputvecs = "  /* input vectors prototypes */\n  "
     inputvecs += "\n  ".join(map(lambda p: p['type'] + ' ' + p['name'] + ";", inputparams))
 
-    parseinput = "/* input vectors parsing */\n  "
+    parseinput = "  /* input vectors parsing */\n  "
     for p in inputparams:
         inputvec = p['name']
-        inputdef = p['name'] + "_obj"
+        if p['type'] != 'uint_t':
+          inputdef = p['name'] + "_obj"
+        else:
+          inputdef = p['name']
         converter = aubiovecfrompyobj[p['type']]
-        parseinput += """%(inputvec)s = %(converter)s (%(inputdef)s);
+        if p['type'] != 'uint_t':
+          parseinput += """%(inputvec)s = %(converter)s (%(inputdef)s);
 
   if (%(inputvec)s == NULL) {
     return NULL;
-  }""" % locals()
+  }
+
+  """ % locals()
 
     # build the string for the input objects references
-    inputrefs = ", ".join(["&" + p['name'] + "_obj" for p in inputparams])
+    inputreflist = []
+    for p in inputparams:
+      if p['type'] != 'uint_t':
+        inputreflist += [ "&" + p['name'] + "_obj" ]
+      else:
+        inputreflist += [ "&" + p['name'] ]
+    inputrefs = ", ".join(inputreflist)
     # end of inputs strings
   return inputdefs, parseinput, inputrefs, inputvecs, pytypes
@@ -343 +360 @@
     if name in param_numbers.keys():
       n_input_param, n_output_param = param_numbers[name]
+      print name, n_output_param
     else:
       n_input_param, n_output_param = 1, n_param - 1

interfaces/python/generator.py

@@ -40 +40 @@
       'resampler',
       'sndfile',
-      'sink',
       'sink_apple_audio',
       'sink_sndfile',