Changeset 9c9cd54 for interfaces

Timestamp:

Dec 25, 2009, 5:02:17 AM (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:

474f297

Parents:

1a6ef2c

Message:

gen_pyobject.py: simplify with proxy functions

File:

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

interfaces/python/gen_pyobject.py

@@ -123 +123 @@
 }
 
-# aubio to pyaubio
-aubio2pyaubio = {
-    'fvec_t*': 'fvec_t',
-    'cvec_t*': 'cvec_t',
-}
-
-# array to aubio
+# python to aubio
 aubiovecfrompyobj = {
     'fvec_t*': 'PyAubio_ArrayToCFvec',
@@ -135 +129 @@
 }
 
-# aubio to array
+# aubio to python
 aubiovectopyobj = {
-    'fvec_t*': 'PyAubio_FvecToArray',
-    'cvec_t*': 'PyAubio_CvecToArray',
-}
-
-aubiovectopyobj_new = {
     'fvec_t*': 'PyAubio_CFvecToArray',
     'cvec_t*': 'PyAubio_CCvecToPyCvec',
@@ -270 +259 @@
     inputdefs = "\n  ".join(["PyObject * " + p[-1] + "_obj;" for p in inputparams])
     inputvecs = "\n  ".join(map(lambda p: \
-                aubio2pyaubio[p[0]]+" * " + p[-1] + ";", inputparams))
+                p[0] + p[-1] + ";", inputparams))
     parseinput = ""
     for p in inputparams:
@@ -290 +279 @@
         #assert len(outputparams) == 1, \
         #    "too many output parameters"
-        outputvecs = "\n  ".join([aubio2pyaubio[p[0]]+" * " + p[-1] + ";" for p in outputparams])
+        outputvecs = "\n  ".join([p[0] + p[-1] + ";" for p in outputparams])
         outputcreate = "\n  ".join(["""\
   %(name)s = new_%(autype)s (%(length)s);""" % \
-    {'name': p[-1], 'pytype': aubio2pyaubio[p[0]], 'autype': p[0][:-3],
+    {'name': p[-1], 'pytype': p[0], 'autype': p[0][:-3],
         'length': defaultsizes[name]} \
         for p in outputparams]) 
@@ -299 +288 @@
             returnval = "PyObject *outputs = PyList_New(0);\n"
             for p in outputparams:
-                returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj_new[p[0]] + " (" + p[-1] + ")" +");\n"
+                returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")" +");\n"
             returnval += "  return outputs;"
         else:
-            returnval = "return (PyObject *)" + aubiovectopyobj_new[p[0]] + " (" + p[-1] + ")"
+            returnval = "return (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")"
     else:
         # no output
@@ -308 +297 @@
         outputcreate = ""
         #returnval = "Py_None";
-        returnval = "return (PyObject *)" + aubiovectopyobj_new[p[0]] + " (" + p[-1] + ")"
+        returnval = "return (PyObject *)" + aubiovectopyobj[p[0]] + " (" + p[-1] + ")"
     # end of output strings
 
@@ -420 +409 @@
             "get method has more than one parameter %s" % params
         getter_args = "self->o" 
-        returnval = "(PyObject *)" + aubiovectopyobj_new[out_type] + " (tmp)"
+        returnval = "(PyObject *)" + aubiovectopyobj[out_type] + " (tmp)"
         shortname = method_name.split(name+'_')[-1]
         method_defs += """\