Changes in / [4c4c9f6:7d50c5a]

Files:

• examples/sndfileio.c (added)
• examples/sndfileio.h (added)
• examples/utils.h (modified) (1 diff)
• examples/wscript_build (modified) (1 diff)
• interfaces/python/demo_sink.py (deleted)
• interfaces/python/demo_source.py (deleted)
• interfaces/python/gen_pyobject.py (modified) (8 diffs)
• interfaces/python/generator.py (modified) (1 diff)
• interfaces/python/test_source.py (deleted)
• src/aubio.h (modified) (1 diff)
• src/io/sink.c (deleted)
• src/io/sink.h (deleted)
• src/io/sink_apple_audio.c (deleted)
• src/io/sink_apple_audio.h (deleted)
• src/io/sink_sndfile.c (deleted)
• src/io/sink_sndfile.h (deleted)
• src/io/sndfileio.c (deleted)
• src/io/sndfileio.h (deleted)
• src/io/source.c (deleted)
• src/io/source.h (deleted)
• src/io/source_apple_audio.c (deleted)
• src/io/source_apple_audio.h (deleted)
• src/io/source_sndfile.c (deleted)
• src/io/source_sndfile.h (deleted)
• src/io/utils_apple_audio.c (deleted)
• src/wscript_build (modified) (1 diff)
• tests/src/io/test-sink.c (deleted)
• tests/src/io/test-sink_apple_audio_file.c (deleted)
• tests/src/io/test-sink_sndfile.c (deleted)
• tests/src/io/test-source.c (deleted)
• tests/src/io/test-source_apple_audio_file.c (deleted)
• tests/src/io/test-source_sndfile.c (deleted)
• wscript (modified) (1 diff)

examples/utils.h

@@ -28 +28 @@
 #include <aubio.h>
 #include "config.h"
+#include "sndfileio.h"
 #ifdef HAVE_JACK
 #include "jackio.h"

examples/wscript_build

@@ -2 +2 @@
 
 # build examples
+sndfileio = ctx.new_task_gen(features = 'c',
+    includes = '../src',
+    source = ['sndfileio.c'],
+    target = 'sndfileio')
+
 utilsio = ctx.new_task_gen(name = 'utilsio', features = 'c',
       includes = '../src',
+      add_objects = 'sndfileio',
       source = ['utils.c', 'jackio.c'],
-      uselib = ['LASH', 'JACK'],
+      uselib = ['LASH', 'JACK', 'SNDFILE'],
       target = 'utilsio')
 
 # loop over all *.c filenames in examples to build them all
-for target_name in ctx.path.ant_glob('*.c', excl = ['utils.c', 'jackio.c']):
+for target_name in ctx.path.ant_glob('*.c', excl = ['utils.c', 'jackio.c', 'sndfileio.c']):
   ctx.new_task_gen(features = 'c cprogram',
       add_objects = 'utilsio',

interfaces/python/gen_pyobject.py

@@ -18 +18 @@
 maintaining this bizarre file.
 """
-
-param_numbers = {
-  'source': [0, 2],
-  'sink':   [2, 0],
-}
 
 # TODO
@@ -86 +81 @@
 # move into the C library at some point.
 defaultsizes = {
-    'resampler':    ['input->length * self->ratio'],
-    'specdesc':     ['1'],
-    'onset':        ['1'],
-    'pitchyin':     ['1'],
-    'pitchyinfft':  ['1'],
-    'pitchschmitt': ['1'],
-    'pitchmcomb':   ['1'],
-    'pitchfcomb':   ['1'],
-    'pitch':        ['1'],
-    'tss':          ['self->win_size', 'self->win_size'],
-    'mfcc':         ['self->n_coeffs'],
-    'beattracking': ['self->hop_size'],
-    'tempo':        ['1'],
-    'peakpicker':   ['1'],
-    'source':       ['self->hop_size', '1'],
+    'resampler':    'input->length * self->ratio',
+    'specdesc':     '1',
+    'onset':        '1',
+    'pitchyin':     '1',
+    'pitchyinfft':  '1',
+    'pitchschmitt': '1',
+    'pitchmcomb':   '1',
+    'pitchfcomb':   '1',
+    'pitch':        '1',
+    'tss':          'self->hop_size',
+    'mfcc':         'self->n_coeffs',
+    'beattracking': 'self->hop_size',
+    'tempo':        '1',
+    'peakpicker':   '1',
 }
 
@@ -129 +123 @@
     'ratio': '0.5',
     'method': '"default"',
-    'uri': '"none"',
     }
 
@@ -146 +139 @@
     'fvec_t*': 'PyAubio_ArrayToCFvec',
     'cvec_t*': 'PyAubio_ArrayToCCvec',
-    'uint_t': '(uint_t)PyInt_AsLong',
 }
 
@@ -154 +146 @@
     'cvec_t*': 'PyAubio_CCvecToPyCvec',
     'smpl_t': 'PyFloat_FromDouble',
-    'uint_t*': 'PyInt_FromLong',
-    'uint_t': 'PyInt_FromLong',
 }
 
@@ -267 +257 @@
     return s
 
-def gen_do_input_params(inputparams):
-  inputdefs = ''
-  parseinput = ''
-  inputrefs = ''
-  inputvecs = ''
-  pytypes = ''
-
-  if len(inputparams):
-    # build the parsing string for PyArg_ParseTuple
-    pytypes = "".join([aubio2pytypes[p['type']] for p in inputparams])
-
-    inputdefs = "  /* input vectors python prototypes */\n"
-    for p in inputparams:
-      if p['type'] != 'uint_t':
-        inputdefs += "  PyObject * " + p['name'] + "_obj;\n"
-
-    inputvecs = "  /* input vectors prototypes */\n  "
-    inputvecs += "\n  ".join(map(lambda p: p['type'] + ' ' + p['name'] + ";", inputparams))
-
-    parseinput = "  /* input vectors parsing */\n  "
-    for p in inputparams:
-        inputvec = p['name']
-        if p['type'] != 'uint_t':
-          inputdef = p['name'] + "_obj"
-        else:
-          inputdef = p['name']
-        converter = aubiovecfrompyobj[p['type']]
-        if p['type'] != 'uint_t':
-          parseinput += """%(inputvec)s = %(converter)s (%(inputdef)s);
-
-  if (%(inputvec)s == NULL) {
-    return NULL;
-  }
-
-  """ % locals()
-
-    # build the string for the input objects references
-    inputreflist = []
-    for p in inputparams:
-      if p['type'] != 'uint_t':
-        inputreflist += [ "&" + p['name'] + "_obj" ]
-      else:
-        inputreflist += [ "&" + p['name'] ]
-    inputrefs = ", ".join(inputreflist)
-    # end of inputs strings
-  return inputdefs, parseinput, inputrefs, inputvecs, pytypes
-
-def gen_do_output_params(outputparams, name):
-  outputvecs = ""
-  outputcreate = ""
-  if len(outputparams):
-    outputvecs = "  /* output vectors prototypes */\n"
-    for p in outputparams:
-      params = {
-        'name': p['name'], 'pytype': p['type'], 'autype': p['type'][:-3],
-        'length': defaultsizes[name].pop(0) }
-      if (p['type'] == 'uint_t*'):
-        outputvecs += '  uint_t' + ' ' + p['name'] + ";\n"
-        outputcreate += "  %(name)s = 0;\n" % params
-      else:
-        outputvecs += "  " + p['type'] + ' ' + p['name'] + ";\n"
-        outputcreate += "  /* creating output %(name)s as a new_%(autype)s of length %(length)s */\n" % params
-        outputcreate += "  %(name)s = new_%(autype)s (%(length)s);\n" % params
-
-  returnval = "";
-  if len(outputparams) > 1:
-    returnval += "  PyObject *outputs = PyList_New(0);\n"
-    for p in outputparams:
-      returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")" +");\n"
-    returnval += "  return outputs;"
-  elif len(outputparams) == 1:
-    if defaultsizes[name] == '1':
-      returnval += "  return (PyObject *)PyFloat_FromDouble(" + p['name'] + "->data[0])"
-    else:
-      returnval += "  return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
-  else:
-    returnval = "  return Py_None;";
-  # end of output strings
-  return outputvecs, outputcreate, returnval
-
 def gen_do(dofunc, name):
     funcname = dofunc.split()[1].split('(')[0]
@@ -355 +265 @@
     # and remove it
     doparams = doparams[1:]
-
-    n_param = len(doparams)
-
-    if name in param_numbers.keys():
-      n_input_param, n_output_param = param_numbers[name]
-      print name, n_output_param
+    # guess the input/output params, assuming we have less than 3
+    assert len(doparams) > 0, \
+        "no parameters for function do in object %s" % name
+    #assert (len(doparams) <= 2), \
+    #    "more than 3 parameters for do in object %s" % name
+
+    # build strings for inputs, assuming there is only one input 
+    inputparams = [doparams[0]]
+    # build the parsing string for PyArg_ParseTuple
+    pytypes = "".join([aubio2pytypes[p['type']] for p in doparams[0:1]])
+
+    inputdefs = "/* input vectors python prototypes */\n  "
+    inputdefs += "\n  ".join(["PyObject * " + p['name'] + "_obj;" for p in inputparams])
+
+    inputvecs = "/* input vectors prototypes */\n  "
+    inputvecs += "\n  ".join(map(lambda p: p['type'] + ' ' + p['name'] + ";", inputparams))
+
+    parseinput = "/* input vectors parsing */\n  "
+    for p in inputparams:
+        inputvec = p['name']
+        inputdef = p['name'] + "_obj"
+        converter = aubiovecfrompyobj[p['type']]
+        parseinput += """%(inputvec)s = %(converter)s (%(inputdef)s);
+
+  if (%(inputvec)s == NULL) {
+    return NULL;
+  }""" % locals()
+
+    # build the string for the input objects references
+    inputrefs = ", ".join(["&" + p['name'] + "_obj" for p in inputparams])
+    # end of inputs strings
+
+    # build strings for outputs
+    outputparams = doparams[1:]
+    if len(outputparams) >= 1:
+        #assert len(outputparams) == 1, \
+        #    "too many output parameters"
+        outputvecs = "\n  /* output vectors prototypes */\n  "
+        outputvecs += "\n  ".join([p['type'] + ' ' + p['name'] + ";" for p in outputparams])
+        params = {
+          'name': p['name'], 'pytype': p['type'], 'autype': p['type'][:-3],
+          'length': defaultsizes[name]}
+        outputcreate = "\n  ".join(["""/* creating output %(name)s as a new_%(autype)s of length %(length)s */""" % \
+            params for p in outputparams]) 
+        outputcreate += "\n"
+        outputcreate += "\n  ".join(["""  %(name)s = new_%(autype)s (%(length)s);""" % \
+            params for p in outputparams]) 
+        returnval = ""
+        if len(outputparams) > 1:
+            returnval += "PyObject *outputs = PyList_New(0);\n"
+            for p in outputparams:
+                returnval += "  PyList_Append( outputs, (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")" +");\n"
+            returnval += "  return outputs;"
+        else:
+            if defaultsizes[name] == '1':
+                returnval += "return (PyObject *)PyFloat_FromDouble(" + p['name'] + "->data[0])"
+            else:
+                returnval += "return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
     else:
-      n_input_param, n_output_param = 1, n_param - 1
-
-    assert n_output_param + n_input_param == n_param, "n_output_param + n_input_param != n_param for %s" % name
-
-    inputparams = doparams[:n_input_param]
-    outputparams = doparams[n_input_param:n_input_param + n_output_param]
-
-    inputdefs, parseinput, inputrefs, inputvecs, pytypes = gen_do_input_params(inputparams);
-    outputvecs, outputcreate, returnval = gen_do_output_params(outputparams, name)
-
-    # build strings for outputs
+        # no output
+        outputvecs = ""
+        outputcreate = ""
+        #returnval = "Py_None";
+        returnval = "return (PyObject *)" + aubiovectopyobj[p['type']] + " (" + p['name'] + ")"
+    # end of output strings
+
     # build the parameters for the  _do() call
-    doparams_string = "self->o"
-    for p in doparams:
-      if p['type'] == 'uint_t*':
-        doparams_string += ", &" + p['name']
-      else:
-        doparams_string += ", " + p['name']
-
-    if n_input_param:
-      arg_parse_tuple = """\
-  if (!PyArg_ParseTuple (args, "%(pytypes)s", %(inputrefs)s)) {
-    return NULL;
-  }
-""" % locals()
-    else:
-      arg_parse_tuple = ""
+    doparams_string = "self->o, " + ", ".join([p['name'] for p in doparams])
+
     # put it all together
     s = """\
@@ -395 +340 @@
 Py_%(name)s_do(Py_%(name)s * self, PyObject * args)
 {
-%(inputdefs)s
-%(inputvecs)s
-%(outputvecs)s
-
-%(arg_parse_tuple)s
-
-%(parseinput)s
+  %(inputdefs)s
+  %(inputvecs)s
+  %(outputvecs)s
+
+  if (!PyArg_ParseTuple (args, "%(pytypes)s", %(inputrefs)s)) {
+    return NULL;
+  }
+
+  %(parseinput)s
   
-%(outputcreate)s
+  %(outputcreate)s
 
   /* compute _do function */
   %(funcname)s (%(doparams_string)s);
 
-%(returnval)s;
+  %(returnval)s;
 }
 """ % locals()

interfaces/python/generator.py

@@ -34 +34 @@
   generated_objects = []
   cpp_output, cpp_objects = get_cpp_objects()
-  skip_objects = ['fft',
-      'pvoc',
-      'filter',
-      'filterbank',
-      'resampler',
-      'sndfile',
-      'sink_apple_audio',
-      'sink_sndfile',
-      'source_apple_audio',
-      'source_sndfile']
+  skip_objects = ['fft', 'pvoc', 'filter', 'filterbank', 'resampler']
 
   write_msg("-- INFO: %d objects in total" % len(cpp_objects))

src/aubio.h

@@ -175 +175 @@
 #include "onset/peakpicker.h"
 #include "tempo/tempo.h"
-#include "io/sndfileio.h"
-#include "io/source.h"
-#include "io/source_sndfile.h"
-#include "io/source_apple_audio.h"
-#include "io/sink.h"
-#include "io/sink_sndfile.h"
-#include "io/sink_apple_audio.h"
 
 #if AUBIO_UNSTABLE

src/wscript_build

@@ -1 +1 @@
 # vim:set syntax=python:
 
-source = ctx.path.ant_glob('*.c **/*.c')
-uselib = []
-
+uselib = ['SAMPLERATE']
 if 'HAVE_FFTW3' in conf.get_env():
-  source.filter(lambda x: not x.endswith('ooura_fft8g.c'))
+  source = ctx.path.ant_glob('*.c **/*.c', excl = ['**/ooura_fft8g.c'])
   uselib += ['FFTW3', 'FFTW3F']
-
-if 'HAVE_SAMPLERATE':
-  uselib += ['SAMPLERATE']
-
-if 'HAVE_SNDFILE':
-  uselib += ['SNDFILE']
+else:
+  source = ctx.path.ant_glob('*.c **/*.c')
 
 # build libaubio

wscript

@@ -74 +74 @@
     ctx.env.CC = 'llvm-gcc-4.2'
     ctx.env.LINK_CC = 'llvm-gcc-4.2'
-    ctx.env.FRAMEWORK = ['CoreFoundation', 'AudioToolbox']
 
   # check for required headers