Changeset 6a50b9e

Timestamp:

Mar 3, 2013, 10:20:30 PM (12 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:

6514bb6

Parents:

68d0492

Message:

python/aubiomodule.c: add midi/bin/freq conversion

Location:

python

Files:

• aubiomodule.c (modified) (2 diffs)
• tests/test_mathutils.py (added)

python/aubiomodule.c

@@ -38 +38 @@
 
   return result;
+}
+
+static char Py_bintomidi_doc[] = "convert bin to midi";
+
+static PyObject *
+Py_bintomidi (PyObject * self, PyObject * args)
+{
+  smpl_t input, samplerate, fftsize;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+    return NULL;
+  }
+
+  output = aubio_bintomidi (input, samplerate, fftsize);
+
+  return (PyObject *)PyFloat_FromDouble (output);
+}
+
+static char Py_miditobin_doc[] = "convert midi to bin";
+
+static PyObject *
+Py_miditobin (PyObject * self, PyObject * args)
+{
+  smpl_t input, samplerate, fftsize;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+    return NULL;
+  }
+
+  output = aubio_miditobin (input, samplerate, fftsize);
+
+  return (PyObject *)PyFloat_FromDouble (output);
+}
+
+static char Py_bintofreq_doc[] = "convert bin to freq";
+
+static PyObject *
+Py_bintofreq (PyObject * self, PyObject * args)
+{
+  smpl_t input, samplerate, fftsize;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+    return NULL;
+  }
+
+  output = aubio_bintofreq (input, samplerate, fftsize);
+
+  return (PyObject *)PyFloat_FromDouble (output);
+}
+
+static char Py_freqtobin_doc[] = "convert freq to bin";
+
+static PyObject *
+Py_freqtobin (PyObject * self, PyObject * args)
+{
+  smpl_t input, samplerate, fftsize;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|fff", &input, &samplerate, &fftsize)) {
+    return NULL;
+  }
+
+  output = aubio_freqtobin (input, samplerate, fftsize);
+
+  return (PyObject *)PyFloat_FromDouble (output);
+}
+
+static char Py_freqtomidi_doc[] = "convert freq to midi";
+
+static PyObject *
+Py_freqtomidi (PyObject * self, PyObject * args)
+{
+  smpl_t input;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|f", &input)) {
+    return NULL;
+  }
+
+  output = aubio_freqtomidi (input);
+
+  return (PyObject *)PyFloat_FromDouble (output);
+}
+
+static char Py_miditofreq_doc[] = "convert midi to freq";
+
+static PyObject *
+Py_miditofreq (PyObject * self, PyObject * args)
+{
+  smpl_t input;
+  smpl_t output;
+
+  if (!PyArg_ParseTuple (args, "|f", &input)) {
+    return NULL;
+  }
+
+  output = aubio_miditofreq (input);
+
+  return (PyObject *)PyFloat_FromDouble (output);
 }
 
@@ -107 +209 @@
 
 static PyMethodDef aubio_methods[] = {
+  {"bintomidi", Py_bintomidi, METH_VARARGS, Py_bintomidi_doc},
+  {"miditobin", Py_miditobin, METH_VARARGS, Py_miditobin_doc},
+  {"bintofreq", Py_bintofreq, METH_VARARGS, Py_bintofreq_doc},
+  {"freqtobin", Py_freqtobin, METH_VARARGS, Py_freqtobin_doc},
+  {"miditofreq", Py_miditofreq, METH_VARARGS, Py_miditofreq_doc},
+  {"freqtomidi", Py_freqtomidi, METH_VARARGS, Py_freqtomidi_doc},
   {"alpha_norm", Py_alpha_norm, METH_VARARGS, Py_alpha_norm_doc},
-  {"zero_crossing_rate", Py_zero_crossing_rate, METH_VARARGS,
-    Py_zero_crossing_rate_doc},
+  {"zero_crossing_rate", Py_zero_crossing_rate, METH_VARARGS, Py_zero_crossing_rate_doc},
   {"min_removal", Py_min_removal, METH_VARARGS, Py_min_removal_doc},
   {NULL, NULL} /* Sentinel */