From: Paul Brossier <piem@piem.org>
Date: Wed, 11 Jul 2012 23:38:40 +0000 (-0700)
Subject: py-filterbank.c: add set_coeffs
X-Git-Tag: 0.4.0-beta1~401
X-Git-Url: https://git.aubio.org/?a=commitdiff_plain;h=f6cbefe280382d27f221cecdbed2a990985a86b2;p=aubio.git

py-filterbank.c: add set_coeffs
---

diff --git a/interfaces/python/py-filterbank.c b/interfaces/python/py-filterbank.c
index dcb2d18a..cc0da481 100644
--- a/interfaces/python/py-filterbank.c
+++ b/interfaces/python/py-filterbank.c
@@ -49,7 +49,7 @@ AUBIO_INIT(filterbank, self->n_filters, self->win_s)
 
 AUBIO_DEL(filterbank)
 
-static PyObject * 
+static PyObject *
 Py_filterbank_do(Py_filterbank * self, PyObject * args)
 {
   PyObject *input;
@@ -73,14 +73,14 @@ Py_filterbank_do(Py_filterbank * self, PyObject * args)
   return (PyObject *)PyAubio_CFvecToArray(out);
 }
 
-AUBIO_MEMBERS_START(filterbank) 
+AUBIO_MEMBERS_START(filterbank)
   {"win_s", T_INT, offsetof (Py_filterbank, win_s), READONLY,
     "size of the window"},
   {"n_filters", T_INT, offsetof (Py_filterbank, n_filters), READONLY,
     "number of filters"},
 AUBIO_MEMBERS_STOP(filterbank)
 
-static PyObject * 
+static PyObject *
 Py_filterbank_set_triangle_bands (Py_filterbank * self, PyObject *args)
 {
   uint_t err = 0;
@@ -112,7 +112,7 @@ Py_filterbank_set_triangle_bands (Py_filterbank * self, PyObject *args)
   return Py_None;
 }
 
-static PyObject * 
+static PyObject *
 Py_filterbank_set_mel_coeffs_slaney (Py_filterbank * self, PyObject *args)
 {
   uint_t err = 0;
@@ -131,7 +131,37 @@ Py_filterbank_set_mel_coeffs_slaney (Py_filterbank * self, PyObject *args)
   return Py_None;
 }
 
-static PyObject * 
+static PyObject *
+Py_filterbank_set_coeffs (Py_filterbank * self, PyObject *args)
+{
+  uint_t err = 0;
+
+  PyObject *input;
+  fmat_t *coeffs;
+
+  if (!PyArg_ParseTuple (args, "O", &input)) {
+    return NULL;
+  }
+
+  coeffs = PyAubio_ArrayToCFmat (input);
+
+  if (coeffs == NULL) {
+    PyErr_SetString (PyExc_ValueError,
+        "unable to parse input array");
+    return NULL;
+  }
+
+  err = aubio_filterbank_set_coeffs (self->o, coeffs);
+
+  if (err > 0) {
+    PyErr_SetString (PyExc_ValueError,
+        "error when setting filter coefficients");
+    return NULL;
+  }
+  return Py_None;
+}
+
+static PyObject *
 Py_filterbank_get_coeffs (Py_filterbank * self, PyObject *unused)
 {
   return (PyObject *)PyAubio_CFmatToArray(
@@ -145,6 +175,8 @@ static PyMethodDef Py_filterbank_methods[] = {
     METH_VARARGS, "set coefficients of filterbank as in Auditory Toolbox"},
   {"get_coeffs", (PyCFunction) Py_filterbank_get_coeffs,
     METH_NOARGS, "get coefficients of filterbank"},
+  {"set_coeffs", (PyCFunction) Py_filterbank_set_coeffs,
+    METH_VARARGS, "set coefficients of filterbank"},
   {NULL}
 };