Changeset 73e068d for python

Timestamp:

Aug 20, 2016, 7:24:11 PM (8 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:

1bd8334

Parents:

eeb4538

Message:

python/lib/gen_code.py: add support for multiple _do outputs

File:

• python/lib/gen_code.py (modified) (4 diffs)

python/lib/gen_code.py

@@ -82 +82 @@
         'tempo': '1',
         'filterbank': 'self->n_filters',
-        'tss': 'self->hop_size',
+        'tss': 'self->buf_size',
         }
 
@@ -94 +94 @@
         'tempo': 'self->hop_size',
         'wavetable': 'self->hop_size',
+        'tss': 'self->buf_size / 2 + 1',
         }
 
@@ -374 +375 @@
         #print input_params
         #print output_params
+        out += """
+    PyObject *outputs;"""
         for input_param in input_params:
             out += """
@@ -416 +419 @@
 
     {do_fn}(self->o, {inputs}, {c_outputs});
-
-    return {outputs};
+""".format(
+        do_fn = do_fn,
+        inputs = inputs, c_outputs = c_outputs,
+        )
+        if len(self.do_outputs) > 1:
+            out += """
+    outputs = PyTuple_New(2);""".format(len(self.do_outputs))
+            for i, p in enumerate(self.do_outputs):
+                out += """
+    PyTuple_SetItem( outputs, {i}, self->{p[name]});""".format(i = i, p = p)
+        else:
+            out += """
+    outputs = self->{p[name]};""".format(p = self.do_outputs[0])
+        out += """
+
+    return outputs;
 }}
 """.format(
-        do_fn = do_fn,
-        inputs = inputs, outputs = outputs, c_outputs = c_outputs,
+        outputs = outputs,
         )
         return out