From 92f107ebf8a37f2d7f660c3fb3241084106df020 Mon Sep 17 00:00:00 2001 From: Greg Ward Date: Tue, 31 Dec 2002 02:54:43 +0000 Subject: Yet another renaming of some mixer methods: devices(), stereodevices(), recdevices() -> controls(), stereocontrols(), reccontrols() Based on recommendation of Hannu Savolainen : The right term to use for things like bass/treble/mic/vol/etc is "control". "Device" refers to different mixer devices (/dev/mixer0 to /dev/mixerN). "Channel" cannot be used because it refers to mono/stereo/multich channels. In fact most mixer controls have left/right channels so ... --- Modules/ossaudiodev.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'Modules/ossaudiodev.c') diff --git a/Modules/ossaudiodev.c b/Modules/ossaudiodev.c index 21c29178b1..be5a888a90 100644 --- a/Modules/ossaudiodev.c +++ b/Modules/ossaudiodev.c @@ -672,23 +672,23 @@ oss_mixer_fileno(oss_mixer_t *self, PyObject *args) /* Simple mixer interface methods */ static PyObject * -oss_mixer_devices(oss_mixer_t *self, PyObject *args) +oss_mixer_controls(oss_mixer_t *self, PyObject *args) { - return _do_ioctl_1_internal(self->fd, args, "devices", + return _do_ioctl_1_internal(self->fd, args, "controls", SOUND_MIXER_READ_DEVMASK); } static PyObject * -oss_mixer_stereodevices(oss_mixer_t *self, PyObject *args) +oss_mixer_stereocontrols(oss_mixer_t *self, PyObject *args) { - return _do_ioctl_1_internal(self->fd, args, "stereodevices", + return _do_ioctl_1_internal(self->fd, args, "stereocontrols", SOUND_MIXER_READ_STEREODEVS); } static PyObject * -oss_mixer_recdevices(oss_mixer_t *self, PyObject *args) +oss_mixer_reccontrols(oss_mixer_t *self, PyObject *args) { - return _do_ioctl_1_internal(self->fd, args, "recdevices", + return _do_ioctl_1_internal(self->fd, args, "reccontrols", SOUND_MIXER_READ_RECMASK); } @@ -791,9 +791,9 @@ static PyMethodDef oss_mixer_methods[] = { { "fileno", (PyCFunction)oss_mixer_fileno, METH_VARARGS }, /* Simple ioctl wrappers */ - { "devices", (PyCFunction)oss_mixer_devices, METH_VARARGS }, - { "stereodevices", (PyCFunction)oss_mixer_stereodevices, METH_VARARGS}, - { "recdevices", (PyCFunction)oss_mixer_recdevices, METH_VARARGS}, + { "controls", (PyCFunction)oss_mixer_controls, METH_VARARGS }, + { "stereocontrols", (PyCFunction)oss_mixer_stereocontrols, METH_VARARGS}, + { "reccontrols", (PyCFunction)oss_mixer_reccontrols, METH_VARARGS}, { "get", (PyCFunction)oss_mixer_get, METH_VARARGS }, { "set", (PyCFunction)oss_mixer_set, METH_VARARGS }, { "get_recsrc", (PyCFunction)oss_mixer_get_recsrc, METH_VARARGS }, -- cgit v1.2.1