SF patch #667548, Add some audio constants by Michael Pruett

Also remove a few unused variables.  Built on IRIX 6.5.

diff --git a/Modules/almodule.c b/Modules/almodule.c
index 8954528ce18eb581cd24ab58f7150b105070b4d4..64306002729f8476304db662e7d4eae503734159 100644 (file)
--- a/Modules/almodule.c
+++ b/Modules/almodule.c
@@ -59,7 +59,6 @@ static PyObject *
 param2python(int resource, int param, ALvalue value, ALparamInfo *pinfo)
 {
        ALparamInfo info;
-       PyObject *v;
 
        if (pinfo == NULL) {
                pinfo = &info;
@@ -717,7 +716,6 @@ PyDoc_STRVAR(alp_ReadFrames__doc__,
 static PyObject *
 alp_ReadFrames(alpobject *self, PyObject *args)
 {
-       void *samples;
        int framecount;
        PyObject *v;
        int size;
@@ -1561,7 +1559,7 @@ static PyObject *
 al_SetParams(PyObject *self, PyObject *args)
 {
        int resource;
-       PyObject *pvslist, *item;
+       PyObject *pvslist;
        ALpv *pvs;
        ALparamInfo *pinfo;
        int npvs, i;
@@ -2545,6 +2543,12 @@ inital(void)
                goto error;
        Py_DECREF(x);
 #endif
+#ifdef AL_LOCKED
+       x =  PyInt_FromLong((long) AL_LOCKED);
+       if (x == NULL || PyDict_SetItemString(d, "LOCKED", x) < 0)
+               goto error;
+       Py_DECREF(x);
+#endif
 #ifdef AL_MASTER_CLOCK
        x =  PyInt_FromLong((long) AL_MASTER_CLOCK);
        if (x == NULL || PyDict_SetItemString(d, "MASTER_CLOCK", x) < 0)
@@ -2695,12 +2699,24 @@ inital(void)
                goto error;
        Py_DECREF(x);
 #endif
+#ifdef AL_NULL_INTERFACE
+       x =  PyInt_FromLong((long) AL_NULL_INTERFACE);
+       if (x == NULL || PyDict_SetItemString(d, "NULL_INTERFACE", x) < 0)
+               goto error;
+       Py_DECREF(x);
+#endif
 #ifdef AL_NULL_RESOURCE
        x =  PyInt_FromLong((long) AL_NULL_RESOURCE);
        if (x == NULL || PyDict_SetItemString(d, "NULL_RESOURCE", x) < 0)
                goto error;
        Py_DECREF(x);
 #endif
+#ifdef AL_OPTICAL_IF_TYPE
+       x =  PyInt_FromLong((long) AL_OPTICAL_IF_TYPE);
+       if (x == NULL || PyDict_SetItemString(d, "OPTICAL_IF_TYPE", x) < 0)
+               goto error;
+       Py_DECREF(x);
+#endif
 #ifdef AL_OUTPUT_COUNT
        x =  PyInt_FromLong((long) AL_OUTPUT_COUNT);
        if (x == NULL || PyDict_SetItemString(d, "OUTPUT_COUNT", x) < 0)
@@ -3049,6 +3065,12 @@ inital(void)
                goto error;
        Py_DECREF(x);
 #endif
+#ifdef AL_SMPTE272M_IF_TYPE
+       x =  PyInt_FromLong((long) AL_SMPTE272M_IF_TYPE);
+       if (x == NULL || PyDict_SetItemString(d, "SMPTE272M_IF_TYPE", x) < 0)
+               goto error;
+       Py_DECREF(x);
+#endif
 #ifdef AL_SOURCE
        x =  PyInt_FromLong((long) AL_SOURCE);
        if (x == NULL || PyDict_SetItemString(d, "SOURCE", x) < 0)