languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-09-19 20:41:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Yet another renaming of some mixer methods:

Browse source 
devices(), stereodevices(), recdevices() ->
  controls(), stereocontrols(), reccontrols()

Based on recommendation of Hannu Savolainen <hannu@opensound.com>:

  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 ...
This commit is contained in:
Greg Ward 2002-12-31 02:54:43 +00:00
parent 5095a47408
commit 2d6f9a9a86
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Modules/ossaudiodev.c
View file

@ -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 },