Changeset 5674833

Timestamp:

May 29, 2017, 7:31:18 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:

150ec2d

Parents:

15a43e0

Message:

gen_external.py : support parsing of non aubio_ function : fvec and stuffs

File:

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

python/lib/gen_external.py

@@ -130 +130 @@
 
     for o in cpp_objects:
-        if o[:6] != 'aubio_':
-            continue
-        shortname = o[6:-2]
+        shortname = ''
+        if o[:6] == 'aubio_':
+            shortname = o[6:-2]  # without aubio_
+            longname = o[:-2]  # without _t
+        else: # support object not starting with aubio_ (fvec...)
+            shortname = o
+            longname = shortname
+        
         if shortname in skip_objects:
             continue
@@ -138 +143 @@
         lib[shortname]['longname'] = o
         lib[shortname]['shortname'] = shortname
+        valid_funcname_part = ['_'+longname,longname+'_']
+
         for fn in cpp_output:
-            if o[:-1] in fn:
-                #print "found", o[:-1], "in", fn
+            func_name = fn.split('(')[0].strip().split(' ')[1:]
+            if func_name:
+                func_name = func_name[-1]
+            else:
+                raise NameError('Warning : error while parsing : unexpected line %s' % fn)
+            if any(x in func_name for x in valid_funcname_part):
+                # print "found", shortname, "in", fn
                 if 'typedef struct ' in fn:
                     lib[shortname]['struct'].append(fn)