[Python-checkins] python/dist/src/Modules ossaudiodev.c,1.3,1.4
gward@users.sourceforge.net
gward@users.sourceforge.net
Sat, 30 Nov 2002 15:17:13 -0800
Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv21269
Modified Files:
ossaudiodev.c
Log Message:
Rename LinuxAudioError to OSSAudioError ('ossaudiodev.error').
Use OSSAudioError much less frequently -- all real I/O errors (ie. any
time open(), read(), write(), ioctl(), or select() return an error)
become IOError. OSSAudioError is only used now for bad open() mode.
Index: ossaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/ossaudiodev.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** ossaudiodev.c 30 Nov 2002 23:05:26 -0000 1.3
--- ossaudiodev.c 30 Nov 2002 23:17:10 -0000 1.4
***************
*** 78,82 ****
static PyTypeObject Ladtype;
! static PyObject *LinuxAudioError;
static lad_t *
--- 78,82 ----
static PyTypeObject Ladtype;
! static PyObject *OSSAudioError;
static lad_t *
***************
*** 107,111 ****
imode = O_RDWR;
else {
! PyErr_SetString(LinuxAudioError, "mode must be 'r', 'w', or 'rw'");
return NULL;
}
--- 107,111 ----
imode = O_RDWR;
else {
! PyErr_SetString(OSSAudioError, "mode must be 'r', 'w', or 'rw'");
return NULL;
}
***************
*** 127,135 ****
if ((fd = open(basedev, imode)) == -1) {
! PyErr_SetFromErrnoWithFilename(LinuxAudioError, basedev);
return NULL;
}
if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) {
! PyErr_SetFromErrnoWithFilename(LinuxAudioError, basedev);
return NULL;
}
--- 127,135 ----
if ((fd = open(basedev, imode)) == -1) {
! PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
return NULL;
}
if (ioctl(fd, SNDCTL_DSP_GETFMTS, &afmts) == -1) {
! PyErr_SetFromErrnoWithFilename(PyExc_IOError, basedev);
return NULL;
}
***************
*** 185,189 ****
if (ioctl(self->x_fd, cmd, &arg) == -1)
! return PyErr_SetFromErrno(LinuxAudioError);
return PyInt_FromLong(arg);
}
--- 185,189 ----
if (ioctl(self->x_fd, cmd, &arg) == -1)
! return PyErr_SetFromErrno(PyExc_IOError);
return PyInt_FromLong(arg);
}
***************
*** 202,206 ****
if (ioctl(self->x_fd, cmd, 0) == -1)
! return PyErr_SetFromErrno(LinuxAudioError);
Py_INCREF(Py_None);
return Py_None;
--- 202,206 ----
if (ioctl(self->x_fd, cmd, 0) == -1)
! return PyErr_SetFromErrno(PyExc_IOError);
Py_INCREF(Py_None);
return Py_None;
***************
*** 216,220 ****
return NULL;
if (ioctl(self->x_fd, SNDCTL_DSP_NONBLOCK, NULL) == -1)
! return PyErr_SetFromErrno(LinuxAudioError);
Py_INCREF(Py_None);
return Py_None;
--- 216,220 ----
return NULL;
if (ioctl(self->x_fd, SNDCTL_DSP_NONBLOCK, NULL) == -1)
! return PyErr_SetFromErrno(PyExc_IOError);
Py_INCREF(Py_None);
return Py_None;
***************
*** 234,238 ****
return NULL;
if (ioctl(self->x_fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
! return PyErr_SetFromErrno(LinuxAudioError);
return PyInt_FromLong(mask);
}
--- 234,238 ----
return NULL;
if (ioctl(self->x_fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
! return PyErr_SetFromErrno(PyExc_IOError);
return PyInt_FromLong(mask);
}
***************
*** 286,290 ****
cp = PyString_AS_STRING(rv);
if ((count = read(self->x_fd, cp, size)) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
Py_DECREF(rv);
return NULL;
--- 286,290 ----
cp = PyString_AS_STRING(rv);
if ((count = read(self->x_fd, cp, size)) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
Py_DECREF(rv);
return NULL;
***************
*** 305,309 ****
}
if ((rv = write(self->x_fd, cp, size)) == -1) {
! return PyErr_SetFromErrno(LinuxAudioError);
} else {
self->x_ocount += rv;
--- 305,309 ----
}
if ((rv = write(self->x_fd, cp, size)) == -1) {
! return PyErr_SetFromErrno(PyExc_IOError);
} else {
self->x_ocount += rv;
***************
*** 338,342 ****
assert(select_rv != 0); /* no timeout, can't expire */
if (select_rv == -1)
! return PyErr_SetFromErrno(LinuxAudioError);
rv = write(self->x_fd, cp, size);
--- 338,342 ----
assert(select_rv != 0); /* no timeout, can't expire */
if (select_rv == -1)
! return PyErr_SetFromErrno(PyExc_IOError);
rv = write(self->x_fd, cp, size);
***************
*** 346,350 ****
continue;
} else /* it's a real error */
! return PyErr_SetFromErrno(LinuxAudioError);
} else { /* wrote rv bytes */
self->x_ocount += rv;
--- 346,350 ----
continue;
} else /* it's a real error */
! return PyErr_SetFromErrno(PyExc_IOError);
} else { /* wrote rv bytes */
self->x_ocount += rv;
***************
*** 432,444 ****
if (ioctl(self->x_fd, SNDCTL_DSP_SETFMT,
&audio_types[n].a_fmt) == -1) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_SPEED, &rate) == -1) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
--- 432,444 ----
if (ioctl(self->x_fd, SNDCTL_DSP_SETFMT,
&audio_types[n].a_fmt) == -1) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_SPEED, &rate) == -1) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
***************
*** 493,501 ****
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
--- 493,501 ----
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
***************
*** 515,523 ****
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
--- 515,523 ----
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
***************
*** 538,546 ****
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
--- 538,546 ----
if (_ssize(self, &nchannels, &ssize) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
***************
*** 562,566 ****
req = SNDCTL_DSP_GETOPTR;
if (ioctl(self->x_fd, req, &info) == -1) {
! PyErr_SetFromErrno(LinuxAudioError);
return NULL;
}
--- 562,566 ----
req = SNDCTL_DSP_GETOPTR;
if (ioctl(self->x_fd, req, &info) == -1) {
! PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
***************
*** 642,648 ****
m = Py_InitModule("linuxaudiodev", linuxaudiodev_methods);
! LinuxAudioError = PyErr_NewException("linuxaudiodev.error", NULL, NULL);
! if (LinuxAudioError)
! PyModule_AddObject(m, "error", LinuxAudioError);
/* Expose the audio format numbers -- essential! */
--- 642,648 ----
m = Py_InitModule("linuxaudiodev", linuxaudiodev_methods);
! OSSAudioError = PyErr_NewException("ossaudiodev.error", NULL, NULL);
! if (OSSAudioError)
! PyModule_AddObject(m, "error", OSSAudioError);
/* Expose the audio format numbers -- essential! */