languages/cpython
languages/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2024-10-14 21:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow the device name to be passed to linuxaudiodev.open(), for

Browse source 
consistency with the built-in open() (and every other sane open()
function, for that matter).  The two valid ways to call this open() are
now open(mode) and open(device, mode).

For backwards compatibility, retain the old open(mode) calling syntax --
this makes the error message when you call open(device) a bit confusing,
but oh well.

This is the first half of SF patch #644977.
This commit is contained in:
Greg Ward 2002-11-27 22:19:15 +00:00
parent ef786ae1a5
commit a34b1a0749
1 changed files with 19 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
Modules/linuxaudiodev.c
View file

@ -79,11 +79,21 @@ newladobject(PyObject *arg)
{
lad_t *xp;
int fd, afmts, imode;
char *mode;
char *basedev;
char *basedev = NULL;
char *mode = NULL;
/* Two ways to call linuxaudiodev.open():
open(device, mode) (for consistency with builtin open())
open(mode) (for backwards compatibility)
because the *first* argument is optional, parsing args is
a wee bit tricky. */
if (!PyArg_ParseTuple(arg, "s|s:open", &basedev, &mode))
return NULL;
if (mode == NULL) { /* only one arg supplied */
mode = basedev;
basedev = NULL;
}
/* Check arg for r/w/rw */
if (!PyArg_ParseTuple(arg, "s:open", &mode)) return NULL;
if (strcmp(mode, "r") == 0)
imode = O_RDONLY;
else if (strcmp(mode, "w") == 0)
@ -102,9 +112,11 @@ newladobject(PyObject *arg)
* latter uses 8-bit unsigned encoding.
*/
basedev = getenv("AUDIODEV");
if (!basedev)
basedev = "/dev/dsp";
if (basedev == NULL) { /* called with one arg */
basedev = getenv("AUDIODEV");
if (basedev == NULL) /* $AUDIODEV not set */
basedev = "/dev/dsp";
}
if ((fd = open(basedev, imode)) == -1) {
PyErr_SetFromErrnoWithFilename(LinuxAudioError, basedev);