Changes in python/ext/py-musicutils.c [ff89a06:a617bf3]
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
python/ext/py-musicutils.c
rff89a06 ra617bf3 40 40 } 41 41 42 level_lin = Py _BuildValue(AUBIO_NPY_SMPL_CHR,aubio_level_lin(&vec));42 level_lin = PyFloat_FromDouble(aubio_level_lin(&vec)); 43 43 if (level_lin == NULL) { 44 44 PyErr_SetString (PyExc_ValueError, "failed computing level_lin"); … … 68 68 } 69 69 70 db_spl = Py _BuildValue(AUBIO_NPY_SMPL_CHR,aubio_db_spl(&vec));70 db_spl = PyFloat_FromDouble(aubio_db_spl(&vec)); 71 71 if (db_spl == NULL) { 72 72 PyErr_SetString (PyExc_ValueError, "failed computing db_spl"); … … 97 97 } 98 98 99 silence_detection = Py _BuildValue("I",aubio_silence_detection(&vec, threshold));99 silence_detection = PyLong_FromLong(aubio_silence_detection(&vec, threshold)); 100 100 if (silence_detection == NULL) { 101 101 PyErr_SetString (PyExc_ValueError, "failed computing silence_detection"); … … 126 126 } 127 127 128 level_detection = Py _BuildValue(AUBIO_NPY_SMPL_CHR,aubio_level_detection(&vec, threshold));128 level_detection = PyFloat_FromDouble(aubio_level_detection(&vec, threshold)); 129 129 if (level_detection == NULL) { 130 130 PyErr_SetString (PyExc_ValueError, "failed computing level_detection"); … … 134 134 return level_detection; 135 135 } 136 137 PyObject * 138 Py_aubio_shift(PyObject *self, PyObject *args) 139 { 140 PyObject *input; 141 fvec_t vec; 142 143 if (!PyArg_ParseTuple (args, "O:shift", &input)) { 144 return NULL; 145 } 146 147 if (input == NULL) { 148 return NULL; 149 } 150 151 if (!PyAubio_ArrayToCFvec(input, &vec)) { 152 return NULL; 153 } 154 155 fvec_shift(&vec); 156 157 //Py_RETURN_NONE; 158 return (PyObject *) PyAubio_CFvecToArray(&vec); 159 } 160 161 PyObject * 162 Py_aubio_ishift(PyObject *self, PyObject *args) 163 { 164 PyObject *input; 165 fvec_t vec; 166 167 if (!PyArg_ParseTuple (args, "O:shift", &input)) { 168 return NULL; 169 } 170 171 if (input == NULL) { 172 return NULL; 173 } 174 175 if (!PyAubio_ArrayToCFvec(input, &vec)) { 176 return NULL; 177 } 178 179 fvec_ishift(&vec); 180 181 //Py_RETURN_NONE; 182 return (PyObject *) PyAubio_CFvecToArray(&vec); 183 } 184 185 PyObject* 186 Py_aubio_hztomel(PyObject *self, PyObject *args, PyObject *kwds) 187 { 188 smpl_t v; 189 PyObject *htk = NULL; 190 static char *kwlist[] = {"f", "htk", NULL}; 191 if (!PyArg_ParseTupleAndKeywords(args, kwds, AUBIO_NPY_SMPL_CHR "|O", 192 kwlist, &v, &htk)) 193 { 194 return NULL; 195 } 196 if (htk != NULL && PyObject_IsTrue(htk) == 1) 197 return PyFloat_FromDouble(aubio_hztomel_htk(v)); 198 else 199 return PyFloat_FromDouble(aubio_hztomel(v)); 200 } 201 202 PyObject* 203 Py_aubio_meltohz(PyObject *self, PyObject *args, PyObject *kwds) 204 { 205 smpl_t v; 206 PyObject *htk = NULL; 207 static char *kwlist[] = {"m", "htk", NULL}; 208 if (!PyArg_ParseTupleAndKeywords(args, kwds, AUBIO_NPY_SMPL_CHR "|O", 209 kwlist, &v, &htk)) 210 { 211 return NULL; 212 } 213 if (htk != NULL && PyObject_IsTrue(htk) == 1) 214 return PyFloat_FromDouble(aubio_meltohz_htk(v)); 215 else 216 return PyFloat_FromDouble(aubio_meltohz(v)); 217 } 218 219 PyObject* 220 Py_aubio_hztomel_htk(PyObject *self, PyObject *args) 221 { 222 smpl_t v; 223 if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) { 224 return NULL; 225 } 226 return PyFloat_FromDouble(aubio_hztomel_htk(v)); 227 } 228 229 PyObject* 230 Py_aubio_meltohz_htk(PyObject *self, PyObject *args) 231 { 232 smpl_t v; 233 if (!PyArg_ParseTuple(args, AUBIO_NPY_SMPL_CHR, &v)) { 234 return NULL; 235 } 236 return PyFloat_FromDouble(aubio_meltohz_htk(v)); 237 }
Note: See TracChangeset
for help on using the changeset viewer.