Changeset 5e392e3e

Timestamp:

Mar 22, 2013, 6:22:12 PM (11 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:

e6cde32

Parents:

dc798e1 (diff), 016dc3b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'synth' into develop

File:

• python/lib/gen_pyobject.py (modified) (2 diffs)

python/lib/gen_pyobject.py

@@ -22 +22 @@
   'source': [0, 2],
   'sink':   [2, 0],
+  'sampler': [1, 1],
 }
 
@@ -101 +102 @@
     'peakpicker':   ['1'],
     'source':       ['self->hop_size', '1'],
+    'sampler':      ['self->hop_size'],
 }