From 2fde69151351f6f55e5efebc47ae1b36167fc1d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20N=C3=B8rgaard?= Date: Fri, 26 Jan 2024 10:05:58 +0000 Subject: [PATCH] remove conditional include stages and add missing func def --- clinic/audioop.c.h | 968 ++++++++++++++++++++------------------------- 1 file changed, 426 insertions(+), 542 deletions(-) diff --git a/clinic/audioop.c.h b/clinic/audioop.c.h index f7511f6..5d88068 100644 --- a/clinic/audioop.c.h +++ b/clinic/audioop.c.h @@ -2,18 +2,61 @@ preserve [clinic start generated code]*/ -#if defined(Py_BUILD_CORE) && !defined(Py_BUILD_CORE_MODULE) -#include "pycore_gc.h" // PyGC_Head -#include "pycore_runtime.h" // _Py_ID() -#endif +#include "Python.h" +#include "assert.h" + +int +_PyArg_CheckPositional(const char *name, Py_ssize_t nargs, + Py_ssize_t min, Py_ssize_t max) +{ + assert(min >= 0); + assert(min <= max); + + if (nargs < min) { + if (name != NULL) + PyErr_Format( + PyExc_TypeError, + "%.200s expected %s%zd argument%s, got %zd", + name, (min == max ? "" : "at least "), min, min == 1 ? "" : "s", nargs); + else + PyErr_Format( + PyExc_TypeError, + "unpacked tuple should have %s%zd element%s," + " but has %zd", + (min == max ? "" : "at least "), min, min == 1 ? "" : "s", nargs); + return 0; + } + + if (nargs == 0) { + return 1; + } + + if (nargs > max) { + if (name != NULL) + PyErr_Format( + PyExc_TypeError, + "%.200s expected %s%zd argument%s, got %zd", + name, (min == max ? "" : "at most "), max, max == 1 ? "" : "s", nargs); + else + PyErr_Format( + PyExc_TypeError, + "unpacked tuple should have %s%zd element%s," + " but has %zd", + (min == max ? "" : "at most "), max, max == 1 ? "" : "s", nargs); + return 0; + } + + return 1; +} + PyDoc_STRVAR(audioop_getsample__doc__, - "getsample($module, fragment, width, index, /)\n" - "--\n" - "\n" - "Return the value of sample index from the fragment."); +"getsample($module, fragment, width, index, /)\n" +"--\n" +"\n" +"Return the value of sample index from the fragment."); -#define AUDIOOP_GETSAMPLE_METHODDEF \ +#define AUDIOOP_GETSAMPLE_METHODDEF \ {"getsample", _PyCFunction_CAST(audioop_getsample), METH_FASTCALL, audioop_getsample__doc__}, static PyObject * @@ -25,37 +68,31 @@ audioop_getsample(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; Py_ssize_t index; - if (!_PyArg_CheckPositional("getsample", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("getsample", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("getsample", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } { Py_ssize_t ival = -1; PyObject *iobj = _PyNumber_Index(args[2]); - if (iobj != NULL) - { + if (iobj != NULL) { ival = PyLong_AsSsize_t(iobj); Py_DECREF(iobj); } - if (ival == -1 && PyErr_Occurred()) - { + if (ival == -1 && PyErr_Occurred()) { goto exit; } index = ival; @@ -64,21 +101,20 @@ audioop_getsample(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_max__doc__, - "max($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the maximum of the absolute value of all samples in a fragment."); +"max($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the maximum of the absolute value of all samples in a fragment."); -#define AUDIOOP_MAX_METHODDEF \ +#define AUDIOOP_MAX_METHODDEF \ {"max", _PyCFunction_CAST(audioop_max), METH_FASTCALL, audioop_max__doc__}, static PyObject * @@ -89,45 +125,40 @@ audioop_max(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("max", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("max", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("max", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_max_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_minmax__doc__, - "minmax($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the minimum and maximum values of all samples in the sound fragment."); +"minmax($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the minimum and maximum values of all samples in the sound fragment."); -#define AUDIOOP_MINMAX_METHODDEF \ +#define AUDIOOP_MINMAX_METHODDEF \ {"minmax", _PyCFunction_CAST(audioop_minmax), METH_FASTCALL, audioop_minmax__doc__}, static PyObject * @@ -138,45 +169,40 @@ audioop_minmax(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("minmax", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("minmax", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("minmax", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_minmax_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_avg__doc__, - "avg($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the average over all samples in the fragment."); +"avg($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the average over all samples in the fragment."); -#define AUDIOOP_AVG_METHODDEF \ +#define AUDIOOP_AVG_METHODDEF \ {"avg", _PyCFunction_CAST(audioop_avg), METH_FASTCALL, audioop_avg__doc__}, static PyObject * @@ -187,45 +213,40 @@ audioop_avg(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - float width; + int width; - if (!_PyArg_CheckPositional("avg", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("avg", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("avg", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_avg_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_rms__doc__, - "rms($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the root-mean-square of the fragment, i.e. sqrt(sum(S_i^2)/n)."); +"rms($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the root-mean-square of the fragment, i.e. sqrt(sum(S_i^2)/n)."); -#define AUDIOOP_RMS_METHODDEF \ +#define AUDIOOP_RMS_METHODDEF \ {"rms", _PyCFunction_CAST(audioop_rms), METH_FASTCALL, audioop_rms__doc__}, static PyObject * @@ -236,45 +257,40 @@ audioop_rms(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("rms", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("rms", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("rms", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_rms_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_findfit__doc__, - "findfit($module, fragment, reference, /)\n" - "--\n" - "\n" - "Try to match reference as well as possible to a portion of fragment."); +"findfit($module, fragment, reference, /)\n" +"--\n" +"\n" +"Try to match reference as well as possible to a portion of fragment."); -#define AUDIOOP_FINDFIT_METHODDEF \ +#define AUDIOOP_FINDFIT_METHODDEF \ {"findfit", _PyCFunction_CAST(audioop_findfit), METH_FASTCALL, audioop_findfit__doc__}, static PyObject * @@ -288,25 +304,20 @@ audioop_findfit(PyObject *module, PyObject *const *args, Py_ssize_t nargs) Py_buffer fragment = {NULL, NULL}; Py_buffer reference = {NULL, NULL}; - if (!_PyArg_CheckPositional("findfit", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("findfit", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("findfit", "argument 1", "contiguous buffer", args[0]); goto exit; } - if (PyObject_GetBuffer(args[1], &reference, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[1], &reference, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&reference, 'C')) - { + if (!PyBuffer_IsContiguous(&reference, 'C')) { _PyArg_BadArgument("findfit", "argument 2", "contiguous buffer", args[1]); goto exit; } @@ -314,26 +325,24 @@ audioop_findfit(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } /* Cleanup for reference */ - if (reference.obj) - { - PyBuffer_Release(&reference); + if (reference.obj) { + PyBuffer_Release(&reference); } return return_value; } PyDoc_STRVAR(audioop_findfactor__doc__, - "findfactor($module, fragment, reference, /)\n" - "--\n" - "\n" - "Return a factor F such that rms(add(fragment, mul(reference, -F))) is minimal."); +"findfactor($module, fragment, reference, /)\n" +"--\n" +"\n" +"Return a factor F such that rms(add(fragment, mul(reference, -F))) is minimal."); -#define AUDIOOP_FINDFACTOR_METHODDEF \ +#define AUDIOOP_FINDFACTOR_METHODDEF \ {"findfactor", _PyCFunction_CAST(audioop_findfactor), METH_FASTCALL, audioop_findfactor__doc__}, static PyObject * @@ -347,25 +356,20 @@ audioop_findfactor(PyObject *module, PyObject *const *args, Py_ssize_t nargs) Py_buffer fragment = {NULL, NULL}; Py_buffer reference = {NULL, NULL}; - if (!_PyArg_CheckPositional("findfactor", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("findfactor", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("findfactor", "argument 1", "contiguous buffer", args[0]); goto exit; } - if (PyObject_GetBuffer(args[1], &reference, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[1], &reference, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&reference, 'C')) - { + if (!PyBuffer_IsContiguous(&reference, 'C')) { _PyArg_BadArgument("findfactor", "argument 2", "contiguous buffer", args[1]); goto exit; } @@ -373,26 +377,24 @@ audioop_findfactor(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } /* Cleanup for reference */ - if (reference.obj) - { - PyBuffer_Release(&reference); + if (reference.obj) { + PyBuffer_Release(&reference); } return return_value; } PyDoc_STRVAR(audioop_findmax__doc__, - "findmax($module, fragment, length, /)\n" - "--\n" - "\n" - "Search fragment for a slice of specified number of samples with maximum energy."); +"findmax($module, fragment, length, /)\n" +"--\n" +"\n" +"Search fragment for a slice of specified number of samples with maximum energy."); -#define AUDIOOP_FINDMAX_METHODDEF \ +#define AUDIOOP_FINDMAX_METHODDEF \ {"findmax", _PyCFunction_CAST(audioop_findmax), METH_FASTCALL, audioop_findmax__doc__}, static PyObject * @@ -406,29 +408,24 @@ audioop_findmax(PyObject *module, PyObject *const *args, Py_ssize_t nargs) Py_buffer fragment = {NULL, NULL}; Py_ssize_t length; - if (!_PyArg_CheckPositional("findmax", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("findmax", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("findmax", "argument 1", "contiguous buffer", args[0]); goto exit; } { Py_ssize_t ival = -1; PyObject *iobj = _PyNumber_Index(args[1]); - if (iobj != NULL) - { + if (iobj != NULL) { ival = PyLong_AsSsize_t(iobj); Py_DECREF(iobj); } - if (ival == -1 && PyErr_Occurred()) - { + if (ival == -1 && PyErr_Occurred()) { goto exit; } length = ival; @@ -437,21 +434,20 @@ audioop_findmax(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_avgpp__doc__, - "avgpp($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the average peak-peak value over all samples in the fragment."); +"avgpp($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the average peak-peak value over all samples in the fragment."); -#define AUDIOOP_AVGPP_METHODDEF \ +#define AUDIOOP_AVGPP_METHODDEF \ {"avgpp", _PyCFunction_CAST(audioop_avgpp), METH_FASTCALL, audioop_avgpp__doc__}, static PyObject * @@ -462,45 +458,40 @@ audioop_avgpp(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("avgpp", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("avgpp", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("avgpp", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_avgpp_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_maxpp__doc__, - "maxpp($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the maximum peak-peak value in the sound fragment."); +"maxpp($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the maximum peak-peak value in the sound fragment."); -#define AUDIOOP_MAXPP_METHODDEF \ +#define AUDIOOP_MAXPP_METHODDEF \ {"maxpp", _PyCFunction_CAST(audioop_maxpp), METH_FASTCALL, audioop_maxpp__doc__}, static PyObject * @@ -511,45 +502,40 @@ audioop_maxpp(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("maxpp", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("maxpp", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("maxpp", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_maxpp_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_cross__doc__, - "cross($module, fragment, width, /)\n" - "--\n" - "\n" - "Return the number of zero crossings in the fragment passed as an argument."); +"cross($module, fragment, width, /)\n" +"--\n" +"\n" +"Return the number of zero crossings in the fragment passed as an argument."); -#define AUDIOOP_CROSS_METHODDEF \ +#define AUDIOOP_CROSS_METHODDEF \ {"cross", _PyCFunction_CAST(audioop_cross), METH_FASTCALL, audioop_cross__doc__}, static PyObject * @@ -560,45 +546,40 @@ audioop_cross(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("cross", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("cross", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("cross", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_cross_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_mul__doc__, - "mul($module, fragment, width, factor, /)\n" - "--\n" - "\n" - "Return a fragment that has all samples in the original fragment multiplied by the floating-point value factor."); +"mul($module, fragment, width, factor, /)\n" +"--\n" +"\n" +"Return a fragment that has all samples in the original fragment multiplied by the floating-point value factor."); -#define AUDIOOP_MUL_METHODDEF \ +#define AUDIOOP_MUL_METHODDEF \ {"mul", _PyCFunction_CAST(audioop_mul), METH_FASTCALL, audioop_mul__doc__}, static PyObject * @@ -610,36 +591,30 @@ audioop_mul(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; double factor; - if (!_PyArg_CheckPositional("mul", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("mul", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("mul", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - if (PyFloat_CheckExact(args[2])) - { + if (PyFloat_CheckExact(args[2])) { factor = PyFloat_AS_DOUBLE(args[2]); } else { factor = PyFloat_AsDouble(args[2]); - if (factor == -1.0 && PyErr_Occurred()) - { + if (factor == -1.0 && PyErr_Occurred()) { goto exit; } } @@ -647,21 +622,20 @@ audioop_mul(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_tomono__doc__, - "tomono($module, fragment, width, lfactor, rfactor, /)\n" - "--\n" - "\n" - "Convert a stereo fragment to a mono fragment."); +"tomono($module, fragment, width, lfactor, rfactor, /)\n" +"--\n" +"\n" +"Convert a stereo fragment to a mono fragment."); -#define AUDIOOP_TOMONO_METHODDEF \ +#define AUDIOOP_TOMONO_METHODDEF \ {"tomono", _PyCFunction_CAST(audioop_tomono), METH_FASTCALL, audioop_tomono__doc__}, static PyObject * @@ -673,49 +647,41 @@ audioop_tomono(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; double lfactor; double rfactor; - if (!_PyArg_CheckPositional("tomono", nargs, 4, 4)) - { + if (!_PyArg_CheckPositional("tomono", nargs, 4, 4)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("tomono", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - if (PyFloat_CheckExact(args[2])) - { + if (PyFloat_CheckExact(args[2])) { lfactor = PyFloat_AS_DOUBLE(args[2]); } else { lfactor = PyFloat_AsDouble(args[2]); - if (lfactor == -1.0 && PyErr_Occurred()) - { + if (lfactor == -1.0 && PyErr_Occurred()) { goto exit; } } - if (PyFloat_CheckExact(args[3])) - { + if (PyFloat_CheckExact(args[3])) { rfactor = PyFloat_AS_DOUBLE(args[3]); } else { rfactor = PyFloat_AsDouble(args[3]); - if (rfactor == -1.0 && PyErr_Occurred()) - { + if (rfactor == -1.0 && PyErr_Occurred()) { goto exit; } } @@ -723,21 +689,20 @@ audioop_tomono(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_tostereo__doc__, - "tostereo($module, fragment, width, lfactor, rfactor, /)\n" - "--\n" - "\n" - "Generate a stereo fragment from a mono fragment."); +"tostereo($module, fragment, width, lfactor, rfactor, /)\n" +"--\n" +"\n" +"Generate a stereo fragment from a mono fragment."); -#define AUDIOOP_TOSTEREO_METHODDEF \ +#define AUDIOOP_TOSTEREO_METHODDEF \ {"tostereo", _PyCFunction_CAST(audioop_tostereo), METH_FASTCALL, audioop_tostereo__doc__}, static PyObject * @@ -749,49 +714,41 @@ audioop_tostereo(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; double lfactor; double rfactor; - if (!_PyArg_CheckPositional("tostereo", nargs, 4, 4)) - { + if (!_PyArg_CheckPositional("tostereo", nargs, 4, 4)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("tostereo", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - if (PyFloat_CheckExact(args[2])) - { + if (PyFloat_CheckExact(args[2])) { lfactor = PyFloat_AS_DOUBLE(args[2]); } else { lfactor = PyFloat_AsDouble(args[2]); - if (lfactor == -1.0 && PyErr_Occurred()) - { + if (lfactor == -1.0 && PyErr_Occurred()) { goto exit; } } - if (PyFloat_CheckExact(args[3])) - { + if (PyFloat_CheckExact(args[3])) { rfactor = PyFloat_AS_DOUBLE(args[3]); } else { rfactor = PyFloat_AsDouble(args[3]); - if (rfactor == -1.0 && PyErr_Occurred()) - { + if (rfactor == -1.0 && PyErr_Occurred()) { goto exit; } } @@ -799,21 +756,20 @@ audioop_tostereo(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_add__doc__, - "add($module, fragment1, fragment2, width, /)\n" - "--\n" - "\n" - "Return a fragment which is the addition of the two samples passed as parameters."); +"add($module, fragment1, fragment2, width, /)\n" +"--\n" +"\n" +"Return a fragment which is the addition of the two samples passed as parameters."); -#define AUDIOOP_ADD_METHODDEF \ +#define AUDIOOP_ADD_METHODDEF \ {"add", _PyCFunction_CAST(audioop_add), METH_FASTCALL, audioop_add__doc__}, static PyObject * @@ -826,59 +782,51 @@ audioop_add(PyObject *module, PyObject *const *args, Py_ssize_t nargs) PyObject *return_value = NULL; Py_buffer fragment1 = {NULL, NULL}; Py_buffer fragment2 = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("add", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("add", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment1, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment1, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment1, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment1, 'C')) { _PyArg_BadArgument("add", "argument 1", "contiguous buffer", args[0]); goto exit; } - if (PyObject_GetBuffer(args[1], &fragment2, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[1], &fragment2, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment2, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment2, 'C')) { _PyArg_BadArgument("add", "argument 2", "contiguous buffer", args[1]); goto exit; } - width = PyLong_AsLong(args[2]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[2]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_add_impl(module, &fragment1, &fragment2, width); exit: /* Cleanup for fragment1 */ - if (fragment1.obj) - { - PyBuffer_Release(&fragment1); + if (fragment1.obj) { + PyBuffer_Release(&fragment1); } /* Cleanup for fragment2 */ - if (fragment2.obj) - { - PyBuffer_Release(&fragment2); + if (fragment2.obj) { + PyBuffer_Release(&fragment2); } return return_value; } PyDoc_STRVAR(audioop_bias__doc__, - "bias($module, fragment, width, bias, /)\n" - "--\n" - "\n" - "Return a fragment that is the original fragment with a bias added to each sample."); +"bias($module, fragment, width, bias, /)\n" +"--\n" +"\n" +"Return a fragment that is the original fragment with a bias added to each sample."); -#define AUDIOOP_BIAS_METHODDEF \ +#define AUDIOOP_BIAS_METHODDEF \ {"bias", _PyCFunction_CAST(audioop_bias), METH_FASTCALL, audioop_bias__doc__}, static PyObject * @@ -889,51 +837,45 @@ audioop_bias(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; - long bias; + int width; + int bias; - if (!_PyArg_CheckPositional("bias", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("bias", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("bias", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - bias = PyLong_AsLong(args[2]); - if (bias == -1 && PyErr_Occurred()) - { + bias = _PyLong_AsInt(args[2]); + if (bias == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_bias_impl(module, &fragment, width, bias); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_reverse__doc__, - "reverse($module, fragment, width, /)\n" - "--\n" - "\n" - "Reverse the samples in a fragment and returns the modified fragment."); +"reverse($module, fragment, width, /)\n" +"--\n" +"\n" +"Reverse the samples in a fragment and returns the modified fragment."); -#define AUDIOOP_REVERSE_METHODDEF \ +#define AUDIOOP_REVERSE_METHODDEF \ {"reverse", _PyCFunction_CAST(audioop_reverse), METH_FASTCALL, audioop_reverse__doc__}, static PyObject * @@ -944,45 +886,40 @@ audioop_reverse(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("reverse", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("reverse", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("reverse", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_reverse_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_byteswap__doc__, - "byteswap($module, fragment, width, /)\n" - "--\n" - "\n" - "Convert big-endian samples to little-endian and vice versa."); +"byteswap($module, fragment, width, /)\n" +"--\n" +"\n" +"Convert big-endian samples to little-endian and vice versa."); -#define AUDIOOP_BYTESWAP_METHODDEF \ +#define AUDIOOP_BYTESWAP_METHODDEF \ {"byteswap", _PyCFunction_CAST(audioop_byteswap), METH_FASTCALL, audioop_byteswap__doc__}, static PyObject * @@ -993,45 +930,40 @@ audioop_byteswap(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("byteswap", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("byteswap", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("byteswap", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_byteswap_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_lin2lin__doc__, - "lin2lin($module, fragment, width, newwidth, /)\n" - "--\n" - "\n" - "Convert samples between 1-, 2-, 3- and 4-byte formats."); +"lin2lin($module, fragment, width, newwidth, /)\n" +"--\n" +"\n" +"Convert samples between 1-, 2-, 3- and 4-byte formats."); -#define AUDIOOP_LIN2LIN_METHODDEF \ +#define AUDIOOP_LIN2LIN_METHODDEF \ {"lin2lin", _PyCFunction_CAST(audioop_lin2lin), METH_FASTCALL, audioop_lin2lin__doc__}, static PyObject * @@ -1043,52 +975,46 @@ audioop_lin2lin(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; - long newwidth; + int width; + int newwidth; - if (!_PyArg_CheckPositional("lin2lin", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("lin2lin", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("lin2lin", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - newwidth = PyLong_AsLong(args[2]); - if (newwidth == -1 && PyErr_Occurred()) - { + newwidth = _PyLong_AsInt(args[2]); + if (newwidth == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_lin2lin_impl(module, &fragment, width, newwidth); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_ratecv__doc__, - "ratecv($module, fragment, width, nchannels, inrate, outrate, state,\n" - " weightA=1, weightB=0, /)\n" - "--\n" - "\n" - "Convert the frame rate of the input fragment."); +"ratecv($module, fragment, width, nchannels, inrate, outrate, state,\n" +" weightA=1, weightB=0, /)\n" +"--\n" +"\n" +"Convert the frame rate of the input fragment."); -#define AUDIOOP_RATECV_METHODDEF \ +#define AUDIOOP_RATECV_METHODDEF \ {"ratecv", _PyCFunction_CAST(audioop_ratecv), METH_FASTCALL, audioop_ratecv__doc__}, static PyObject * @@ -1101,64 +1027,53 @@ audioop_ratecv(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; - long nchannels; - long inrate; - long outrate; + int width; + int nchannels; + int inrate; + int outrate; PyObject *state; - long weightA = 1; - long weightB = 0; + int weightA = 1; + int weightB = 0; - if (!_PyArg_CheckPositional("ratecv", nargs, 6, 8)) - { + if (!_PyArg_CheckPositional("ratecv", nargs, 6, 8)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("ratecv", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } - nchannels = PyLong_AsLong(args[2]); - if (nchannels == -1 && PyErr_Occurred()) - { + nchannels = _PyLong_AsInt(args[2]); + if (nchannels == -1 && PyErr_Occurred()) { goto exit; } - inrate = PyLong_AsLong(args[3]); - if (inrate == -1 && PyErr_Occurred()) - { + inrate = _PyLong_AsInt(args[3]); + if (inrate == -1 && PyErr_Occurred()) { goto exit; } - outrate = PyLong_AsLong(args[4]); - if (outrate == -1 && PyErr_Occurred()) - { + outrate = _PyLong_AsInt(args[4]); + if (outrate == -1 && PyErr_Occurred()) { goto exit; } state = args[5]; - if (nargs < 7) - { + if (nargs < 7) { goto skip_optional; } - weightA = PyLong_AsLong(args[6]); - if (weightA == -1 && PyErr_Occurred()) - { + weightA = _PyLong_AsInt(args[6]); + if (weightA == -1 && PyErr_Occurred()) { goto exit; } - if (nargs < 8) - { + if (nargs < 8) { goto skip_optional; } - weightB = PyLong_AsLong(args[7]); - if (weightB == -1 && PyErr_Occurred()) - { + weightB = _PyLong_AsInt(args[7]); + if (weightB == -1 && PyErr_Occurred()) { goto exit; } skip_optional: @@ -1166,21 +1081,20 @@ audioop_ratecv(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_lin2ulaw__doc__, - "lin2ulaw($module, fragment, width, /)\n" - "--\n" - "\n" - "Convert samples in the audio fragment to u-LAW encoding."); +"lin2ulaw($module, fragment, width, /)\n" +"--\n" +"\n" +"Convert samples in the audio fragment to u-LAW encoding."); -#define AUDIOOP_LIN2ULAW_METHODDEF \ +#define AUDIOOP_LIN2ULAW_METHODDEF \ {"lin2ulaw", _PyCFunction_CAST(audioop_lin2ulaw), METH_FASTCALL, audioop_lin2ulaw__doc__}, static PyObject * @@ -1191,45 +1105,40 @@ audioop_lin2ulaw(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("lin2ulaw", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("lin2ulaw", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("lin2ulaw", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_lin2ulaw_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_ulaw2lin__doc__, - "ulaw2lin($module, fragment, width, /)\n" - "--\n" - "\n" - "Convert sound fragments in u-LAW encoding to linearly encoded sound fragments."); +"ulaw2lin($module, fragment, width, /)\n" +"--\n" +"\n" +"Convert sound fragments in u-LAW encoding to linearly encoded sound fragments."); -#define AUDIOOP_ULAW2LIN_METHODDEF \ +#define AUDIOOP_ULAW2LIN_METHODDEF \ {"ulaw2lin", _PyCFunction_CAST(audioop_ulaw2lin), METH_FASTCALL, audioop_ulaw2lin__doc__}, static PyObject * @@ -1240,45 +1149,40 @@ audioop_ulaw2lin(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("ulaw2lin", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("ulaw2lin", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("ulaw2lin", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_ulaw2lin_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_lin2alaw__doc__, - "lin2alaw($module, fragment, width, /)\n" - "--\n" - "\n" - "Convert samples in the audio fragment to a-LAW encoding."); +"lin2alaw($module, fragment, width, /)\n" +"--\n" +"\n" +"Convert samples in the audio fragment to a-LAW encoding."); -#define AUDIOOP_LIN2ALAW_METHODDEF \ +#define AUDIOOP_LIN2ALAW_METHODDEF \ {"lin2alaw", _PyCFunction_CAST(audioop_lin2alaw), METH_FASTCALL, audioop_lin2alaw__doc__}, static PyObject * @@ -1289,45 +1193,40 @@ audioop_lin2alaw(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("lin2alaw", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("lin2alaw", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("lin2alaw", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_lin2alaw_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_alaw2lin__doc__, - "alaw2lin($module, fragment, width, /)\n" - "--\n" - "\n" - "Convert sound fragments in a-LAW encoding to linearly encoded sound fragments."); +"alaw2lin($module, fragment, width, /)\n" +"--\n" +"\n" +"Convert sound fragments in a-LAW encoding to linearly encoded sound fragments."); -#define AUDIOOP_ALAW2LIN_METHODDEF \ +#define AUDIOOP_ALAW2LIN_METHODDEF \ {"alaw2lin", _PyCFunction_CAST(audioop_alaw2lin), METH_FASTCALL, audioop_alaw2lin__doc__}, static PyObject * @@ -1338,45 +1237,40 @@ audioop_alaw2lin(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; - if (!_PyArg_CheckPositional("alaw2lin", nargs, 2, 2)) - { + if (!_PyArg_CheckPositional("alaw2lin", nargs, 2, 2)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("alaw2lin", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } return_value = audioop_alaw2lin_impl(module, &fragment, width); exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_lin2adpcm__doc__, - "lin2adpcm($module, fragment, width, state, /)\n" - "--\n" - "\n" - "Convert samples to 4 bit Intel/DVI ADPCM encoding."); +"lin2adpcm($module, fragment, width, state, /)\n" +"--\n" +"\n" +"Convert samples to 4 bit Intel/DVI ADPCM encoding."); -#define AUDIOOP_LIN2ADPCM_METHODDEF \ +#define AUDIOOP_LIN2ADPCM_METHODDEF \ {"lin2adpcm", _PyCFunction_CAST(audioop_lin2adpcm), METH_FASTCALL, audioop_lin2adpcm__doc__}, static PyObject * @@ -1388,25 +1282,21 @@ audioop_lin2adpcm(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; PyObject *state; - if (!_PyArg_CheckPositional("lin2adpcm", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("lin2adpcm", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("lin2adpcm", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } state = args[2]; @@ -1414,21 +1304,20 @@ audioop_lin2adpcm(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value; } PyDoc_STRVAR(audioop_adpcm2lin__doc__, - "adpcm2lin($module, fragment, width, state, /)\n" - "--\n" - "\n" - "Decode an Intel/DVI ADPCM coded fragment to a linear fragment."); +"adpcm2lin($module, fragment, width, state, /)\n" +"--\n" +"\n" +"Decode an Intel/DVI ADPCM coded fragment to a linear fragment."); -#define AUDIOOP_ADPCM2LIN_METHODDEF \ +#define AUDIOOP_ADPCM2LIN_METHODDEF \ {"adpcm2lin", _PyCFunction_CAST(audioop_adpcm2lin), METH_FASTCALL, audioop_adpcm2lin__doc__}, static PyObject * @@ -1440,25 +1329,21 @@ audioop_adpcm2lin(PyObject *module, PyObject *const *args, Py_ssize_t nargs) { PyObject *return_value = NULL; Py_buffer fragment = {NULL, NULL}; - long width; + int width; PyObject *state; - if (!_PyArg_CheckPositional("adpcm2lin", nargs, 3, 3)) - { + if (!_PyArg_CheckPositional("adpcm2lin", nargs, 3, 3)) { goto exit; } - if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) - { + if (PyObject_GetBuffer(args[0], &fragment, PyBUF_SIMPLE) != 0) { goto exit; } - if (!PyBuffer_IsContiguous(&fragment, 'C')) - { + if (!PyBuffer_IsContiguous(&fragment, 'C')) { _PyArg_BadArgument("adpcm2lin", "argument 1", "contiguous buffer", args[0]); goto exit; } - width = PyLong_AsLong(args[1]); - if (width == -1 && PyErr_Occurred()) - { + width = _PyLong_AsInt(args[1]); + if (width == -1 && PyErr_Occurred()) { goto exit; } state = args[2]; @@ -1466,9 +1351,8 @@ audioop_adpcm2lin(PyObject *module, PyObject *const *args, Py_ssize_t nargs) exit: /* Cleanup for fragment */ - if (fragment.obj) - { - PyBuffer_Release(&fragment); + if (fragment.obj) { + PyBuffer_Release(&fragment); } return return_value;