Changeset 51ca615 for python

Timestamp:

May 30, 2017, 5:12:55 PM (8 years ago)

Author:

Martin Hermant <martin.hermant@gmail.com>

Branches:

feature/autosink, feature/cnn, feature/cnn_org, feature/constantq, feature/crepe, feature/crepe_org, feature/pitchshift, feature/pydocstrings, feature/timestretch, fix/ffmpeg5, master

Children:

dad51ce

Parents:

6e5c03a

Message:

gen_external.py : pass skip_object as member of function to allow custom skip_objects lists

File:

• python/lib/gen_external.py (modified) (3 diffs)

python/lib/gen_external.py

@@ -12 +12 @@
 """
 
-skip_objects = [
+default_skip_objects = [
     # already in ext/
     'fft',
@@ -136 +136 @@
 
 
-def get_cpp_objects_from_c_declarations(c_declarations):
+def get_cpp_objects_from_c_declarations(c_declarations,skip_objects = None):
+    if skip_objects==None:
+        skip_objects = default_skip_objects
     typedefs = filter(lambda y: y.startswith('typedef struct _aubio'), c_declarations)
     cpp_objects = [a.split()[3][:-1] for a in typedefs]
-    return cpp_objects
+    cpp_objects_filtered = filter(lambda y: not y[6:-2] in skip_objects, cpp_objects)
+    return cpp_objects_filtered
 
 
@@ -178 +181 @@
         if o[:6] == 'aubio_':
             shortname = o[6:-2]  # without aubio_ prefix and _t suffix
-
-        if shortname in skip_objects:
-            continue
 
         lib[shortname] = {'struct': [], 'new': [], 'del': [], 'do': [], 'get': [], 'set': [], 'other': []}