Kaydet (Commit) 9a568eb2 authored tarafından Greg Ward's avatar Greg Ward

Expunge any remaining mentions of linuxaudiodev -- it's ossaudiodev now!

üst 97708bc6
...@@ -87,7 +87,7 @@ newladobject(PyObject *arg) ...@@ -87,7 +87,7 @@ newladobject(PyObject *arg)
char *basedev = NULL; char *basedev = NULL;
char *mode = NULL; char *mode = NULL;
/* Two ways to call linuxaudiodev.open(): /* Two ways to call open():
open(device, mode) (for consistency with builtin open()) open(device, mode) (for consistency with builtin open())
open(mode) (for backwards compatibility) open(mode) (for backwards compatibility)
because the *first* argument is optional, parsing args is because the *first* argument is optional, parsing args is
...@@ -607,7 +607,7 @@ lad_getattr(lad_t *xp, char *name) ...@@ -607,7 +607,7 @@ lad_getattr(lad_t *xp, char *name)
static PyTypeObject Ladtype = { static PyTypeObject Ladtype = {
PyObject_HEAD_INIT(&PyType_Type) PyObject_HEAD_INIT(&PyType_Type)
0, /*ob_size*/ 0, /*ob_size*/
"linuxaudiodev.linux_audio_device", /*tp_name*/ "ossaudiodev.oss_audio_device", /*tp_name*/
sizeof(lad_t), /*tp_size*/ sizeof(lad_t), /*tp_size*/
0, /*tp_itemsize*/ 0, /*tp_itemsize*/
/* methods */ /* methods */
...@@ -620,13 +620,13 @@ static PyTypeObject Ladtype = { ...@@ -620,13 +620,13 @@ static PyTypeObject Ladtype = {
}; };
static PyObject * static PyObject *
ladopen(PyObject *self, PyObject *args) ossopen(PyObject *self, PyObject *args)
{ {
return (PyObject *)newladobject(args); return (PyObject *)newladobject(args);
} }
static PyMethodDef linuxaudiodev_methods[] = { static PyMethodDef ossaudiodev_methods[] = {
{ "open", ladopen, METH_VARARGS }, { "open", ossopen, METH_VARARGS },
{ 0, 0 }, { 0, 0 },
}; };
...@@ -635,11 +635,11 @@ static PyMethodDef linuxaudiodev_methods[] = { ...@@ -635,11 +635,11 @@ static PyMethodDef linuxaudiodev_methods[] = {
if (PyModule_AddIntConstant(mod, #name, (long) (name)) == -1) return; if (PyModule_AddIntConstant(mod, #name, (long) (name)) == -1) return;
void void
initlinuxaudiodev(void) initossaudiodev(void)
{ {
PyObject *m; PyObject *m;
m = Py_InitModule("linuxaudiodev", linuxaudiodev_methods); m = Py_InitModule("ossaudiodev", ossaudiodev_methods);
OSSAudioError = PyErr_NewException("ossaudiodev.error", NULL, NULL); OSSAudioError = PyErr_NewException("ossaudiodev.error", NULL, NULL);
if (OSSAudioError) if (OSSAudioError)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment