[Python-checkins] python/dist/src/Modules ossaudiodev.c,1.9,1.10
gward@users.sourceforge.net
gward@users.sourceforge.net
Sun, 29 Dec 2002 18:29:31 -0800
Update of /cvsroot/python/python/dist/src/Modules
In directory sc8-pr-cvs1:/tmp/cvs-serv2757
Modified Files:
ossaudiodev.c
Log Message:
Remove 'x_' prefix from oss_t and oss_mixer_t struct members.
(It added nothing, and served no obvious purpose.)
Index: ossaudiodev.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/ossaudiodev.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ossaudiodev.c 12 Dec 2002 17:35:45 -0000 1.9
--- ossaudiodev.c 30 Dec 2002 02:29:28 -0000 1.10
***************
*** 48,61 ****
typedef struct {
PyObject_HEAD;
! int x_fd; /* The open file */
! int x_mode; /* file mode */
! int x_icount; /* Input count */
! int x_ocount; /* Output count */
! uint32_t x_afmts; /* Audio formats supported by hardware*/
} oss_t;
typedef struct {
PyObject_HEAD;
! int x_fd; /* The open mixer device */
} oss_mixer_t;
--- 48,61 ----
typedef struct {
PyObject_HEAD;
! int fd; /* The open file */
! int mode; /* file mode */
! int icount; /* Input count */
! int ocount; /* Output count */
! uint32_t afmts; /* Audio formats supported by hardware */
} oss_t;
typedef struct {
PyObject_HEAD;
! int fd; /* The open mixer device */
} oss_mixer_t;
***************
*** 146,153 ****
return NULL;
}
! xp->x_fd = fd;
! xp->x_mode = imode;
! xp->x_icount = xp->x_ocount = 0;
! xp->x_afmts = afmts;
return xp;
}
--- 146,153 ----
return NULL;
}
! xp->fd = fd;
! xp->mode = imode;
! xp->icount = xp->ocount = 0;
! xp->afmts = afmts;
return xp;
}
***************
*** 157,162 ****
{
/* if already closed, don't reclose it */
! if (xp->x_fd != -1)
! close(xp->x_fd);
PyObject_Del(xp);
}
--- 157,162 ----
{
/* if already closed, don't reclose it */
! if (xp->fd != -1)
! close(xp->fd);
PyObject_Del(xp);
}
***************
*** 200,204 ****
}
! xp->x_fd = fd;
return xp;
--- 200,204 ----
}
! xp->fd = fd;
return xp;
***************
*** 209,214 ****
{
/* if already closed, don't reclose it */
! if (xp->x_fd != -1)
! close(xp->x_fd);
PyObject_Del(xp);
}
--- 209,214 ----
{
/* if already closed, don't reclose it */
! if (xp->fd != -1)
! close(xp->fd);
PyObject_Del(xp);
}
***************
*** 301,305 ****
if (!PyArg_ParseTuple(args, ":nonblock"))
return NULL;
! if (ioctl(self->x_fd, SNDCTL_DSP_NONBLOCK, NULL) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
Py_INCREF(Py_None);
--- 301,305 ----
if (!PyArg_ParseTuple(args, ":nonblock"))
return NULL;
! if (ioctl(self->fd, SNDCTL_DSP_NONBLOCK, NULL) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
Py_INCREF(Py_None);
***************
*** 310,314 ****
oss_setfmt(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->x_fd, args, "setfmt", SNDCTL_DSP_SETFMT);
}
--- 310,314 ----
oss_setfmt(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->fd, args, "setfmt", SNDCTL_DSP_SETFMT);
}
***************
*** 319,323 ****
if (!PyArg_ParseTuple(args, ":getfmts"))
return NULL;
! if (ioctl(self->x_fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
return PyInt_FromLong(mask);
--- 319,323 ----
if (!PyArg_ParseTuple(args, ":getfmts"))
return NULL;
! if (ioctl(self->fd, SNDCTL_DSP_GETFMTS, &mask) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
return PyInt_FromLong(mask);
***************
*** 327,331 ****
oss_channels(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->x_fd, args, "channels", SNDCTL_DSP_CHANNELS);
}
--- 327,331 ----
oss_channels(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->fd, args, "channels", SNDCTL_DSP_CHANNELS);
}
***************
*** 333,337 ****
oss_speed(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->x_fd, args, "speed", SNDCTL_DSP_SPEED);
}
--- 333,337 ----
oss_speed(oss_t *self, PyObject *args)
{
! return _do_ioctl_1(self->fd, args, "speed", SNDCTL_DSP_SPEED);
}
***************
*** 339,343 ****
oss_sync(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->x_fd, args, "sync", SNDCTL_DSP_SYNC);
}
--- 339,343 ----
oss_sync(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->fd, args, "sync", SNDCTL_DSP_SYNC);
}
***************
*** 345,349 ****
oss_reset(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->x_fd, args, "reset", SNDCTL_DSP_RESET);
}
--- 345,349 ----
oss_reset(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->fd, args, "reset", SNDCTL_DSP_RESET);
}
***************
*** 351,355 ****
oss_post(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->x_fd, args, "post", SNDCTL_DSP_POST);
}
--- 351,355 ----
oss_post(oss_t *self, PyObject *args)
{
! return _do_ioctl_0(self->fd, args, "post", SNDCTL_DSP_POST);
}
***************
*** 371,380 ****
return NULL;
cp = PyString_AS_STRING(rv);
! if ((count = read(self->x_fd, cp, size)) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
Py_DECREF(rv);
return NULL;
}
! self->x_icount += count;
_PyString_Resize(&rv, count);
return rv;
--- 371,380 ----
return NULL;
cp = PyString_AS_STRING(rv);
! if ((count = read(self->fd, cp, size)) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
Py_DECREF(rv);
return NULL;
}
! self->icount += count;
_PyString_Resize(&rv, count);
return rv;
***************
*** 390,397 ****
return NULL;
}
! if ((rv = write(self->x_fd, cp, size)) == -1) {
return PyErr_SetFromErrno(PyExc_IOError);
} else {
! self->x_ocount += rv;
}
return PyInt_FromLong(rv);
--- 390,397 ----
return NULL;
}
! if ((rv = write(self->fd, cp, size)) == -1) {
return PyErr_SetFromErrno(PyExc_IOError);
} else {
! self->ocount += rv;
}
return PyInt_FromLong(rv);
***************
*** 418,430 ****
/* use select to wait for audio device to be available */
FD_ZERO(&write_set_fds);
! FD_SET(self->x_fd, &write_set_fds);
while (size > 0) {
! select_rv = select(self->x_fd+1, NULL, &write_set_fds, NULL, NULL);
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);
if (rv == -1) {
if (errno == EAGAIN) { /* buffer is full, try again */
--- 418,430 ----
/* use select to wait for audio device to be available */
FD_ZERO(&write_set_fds);
! FD_SET(self->fd, &write_set_fds);
while (size > 0) {
! select_rv = select(self->fd+1, NULL, &write_set_fds, NULL, NULL);
assert(select_rv != 0); /* no timeout, can't expire */
if (select_rv == -1)
return PyErr_SetFromErrno(PyExc_IOError);
! rv = write(self->fd, cp, size);
if (rv == -1) {
if (errno == EAGAIN) { /* buffer is full, try again */
***************
*** 434,438 ****
return PyErr_SetFromErrno(PyExc_IOError);
} else { /* wrote rv bytes */
! self->x_ocount += rv;
size -= rv;
cp += rv;
--- 434,438 ----
return PyErr_SetFromErrno(PyExc_IOError);
} else { /* wrote rv bytes */
! self->ocount += rv;
size -= rv;
cp += rv;
***************
*** 449,455 ****
return NULL;
! if (self->x_fd >= 0) {
! close(self->x_fd);
! self->x_fd = -1;
}
Py_INCREF(Py_None);
--- 449,455 ----
return NULL;
! if (self->fd >= 0) {
! close(self->fd);
! self->fd = -1;
}
Py_INCREF(Py_None);
***************
*** 462,466 ****
if (!PyArg_ParseTuple(args, ":fileno"))
return NULL;
! return PyInt_FromLong(self->x_fd);
}
--- 462,466 ----
if (!PyArg_ParseTuple(args, ":fileno"))
return NULL;
! return PyInt_FromLong(self->fd);
}
***************
*** 509,513 ****
if (emulate == 0) {
! if ((self->x_afmts & audio_types[n].a_fmt) == 0) {
PyErr_Format(PyExc_ValueError,
"%s format not supported by device",
--- 509,513 ----
if (emulate == 0) {
! if ((self->afmts & audio_types[n].a_fmt) == 0) {
PyErr_Format(PyExc_ValueError,
"%s format not supported by device",
***************
*** 516,529 ****
}
}
! 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;
--- 516,529 ----
}
}
! if (ioctl(self->fd, SNDCTL_DSP_SETFMT,
&audio_types[n].a_fmt) == -1) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
! if (ioctl(self->fd, SNDCTL_DSP_CHANNELS, &nchannels) == -1) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
}
! if (ioctl(self->fd, SNDCTL_DSP_SPEED, &rate) == -1) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
***************
*** 540,544 ****
fmt = 0;
! if (ioctl(self->x_fd, SNDCTL_DSP_SETFMT, &fmt) < 0)
return -errno;
--- 540,544 ----
fmt = 0;
! if (ioctl(self->fd, SNDCTL_DSP_SETFMT, &fmt) < 0)
return -errno;
***************
*** 562,566 ****
}
*nchannels = 0;
! if (ioctl(self->x_fd, SNDCTL_DSP_CHANNELS, nchannels) < 0)
return -errno;
return 0;
--- 562,566 ----
}
*nchannels = 0;
! if (ioctl(self->fd, SNDCTL_DSP_CHANNELS, nchannels) < 0)
return -errno;
return 0;
***************
*** 582,586 ****
return NULL;
}
! if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
--- 582,586 ----
return NULL;
}
! if (ioctl(self->fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
***************
*** 604,608 ****
return NULL;
}
! if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
--- 604,608 ----
return NULL;
}
! if (ioctl(self->fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
***************
*** 627,631 ****
return NULL;
}
! if (ioctl(self->x_fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
--- 627,631 ----
return NULL;
}
! if (ioctl(self->fd, SNDCTL_DSP_GETOSPACE, &ai) < 0) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
***************
*** 643,651 ****
return NULL;
! if (self->x_mode == O_RDONLY)
req = SNDCTL_DSP_GETIPTR;
else
req = SNDCTL_DSP_GETOPTR;
! if (ioctl(self->x_fd, req, &info) == -1) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
--- 643,651 ----
return NULL;
! if (self->mode == O_RDONLY)
req = SNDCTL_DSP_GETIPTR;
else
req = SNDCTL_DSP_GETOPTR;
! if (ioctl(self->fd, req, &info) == -1) {
PyErr_SetFromErrno(PyExc_IOError);
return NULL;
***************
*** 661,667 ****
return NULL;
! if (self->x_fd >= 0) {
! close(self->x_fd);
! self->x_fd = -1;
}
Py_INCREF(Py_None);
--- 661,667 ----
return NULL;
! if (self->fd >= 0) {
! close(self->fd);
! self->fd = -1;
}
Py_INCREF(Py_None);
***************
*** 674,678 ****
if (!PyArg_ParseTuple(args, ":fileno"))
return NULL;
! return PyInt_FromLong(self->x_fd);
}
--- 674,678 ----
if (!PyArg_ParseTuple(args, ":fileno"))
return NULL;
! return PyInt_FromLong(self->fd);
}
***************
*** 682,686 ****
oss_mixer_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->x_fd, args, "channels",
SOUND_MIXER_READ_DEVMASK);
}
--- 682,686 ----
oss_mixer_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->fd, args, "channels",
SOUND_MIXER_READ_DEVMASK);
}
***************
*** 689,693 ****
oss_mixer_stereo_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->x_fd, args, "stereochannels",
SOUND_MIXER_READ_STEREODEVS);
}
--- 689,693 ----
oss_mixer_stereo_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->fd, args, "stereochannels",
SOUND_MIXER_READ_STEREODEVS);
}
***************
*** 696,700 ****
oss_mixer_rec_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->x_fd, args, "recchannels",
SOUND_MIXER_READ_RECMASK);
}
--- 696,700 ----
oss_mixer_rec_channels (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->fd, args, "recchannels",
SOUND_MIXER_READ_RECMASK);
}
***************
*** 714,718 ****
}
! if (ioctl (self->x_fd, MIXER_READ(channel), &volume) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
--- 714,718 ----
}
! if (ioctl (self->fd, MIXER_READ(channel), &volume) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
***************
*** 741,745 ****
volume = (rightVol << 8) | leftVol;
! if (ioctl (self->x_fd, MIXER_WRITE(channel), &volume) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
--- 741,745 ----
volume = (rightVol << 8) | leftVol;
! if (ioctl (self->fd, MIXER_WRITE(channel), &volume) == -1)
return PyErr_SetFromErrno(PyExc_IOError);
***************
*** 750,754 ****
oss_mixer_getrecsrc (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->x_fd, args, "getrecsrc",
SOUND_MIXER_READ_RECSRC);
}
--- 750,754 ----
oss_mixer_getrecsrc (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1_internal(self->fd, args, "getrecsrc",
SOUND_MIXER_READ_RECSRC);
}
***************
*** 757,761 ****
oss_mixer_setrecsrc (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1(self->x_fd, args, "setrecsrc",
SOUND_MIXER_WRITE_RECSRC);
}
--- 757,761 ----
oss_mixer_setrecsrc (oss_mixer_t *self, PyObject *args)
{
! return _do_ioctl_1(self->fd, args, "setrecsrc",
SOUND_MIXER_WRITE_RECSRC);
}
***************
*** 902,905 ****
--- 902,906 ----
/* Expose the sound mixer channels. */
+ _EXPORT_INT(m, SOUND_MIXER_NRDEVICES);
_EXPORT_INT(m, SOUND_MIXER_VOLUME);
_EXPORT_INT(m, SOUND_MIXER_BASS);