auracaster/sw_pyalsaaudio
3
0
Fork 0
forked from auracaster/pyalsaaudio
Code Pull Requests Activity

Fix get_pcmtype for Python2.7

Browse Source
This commit is contained in:
Lars Immisch
2015-05-11 08:18:40 +00:00
parent 750140c278
commit a83979a71e
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
alsaaudio.c
View File

@@ -20,9 +20,6 @@
#define PyLong_Check PyInt_Check #define PyLong_Check PyInt_Check
#define PyLong_AS_LONG PyInt_AS_LONG #define PyLong_AS_LONG PyInt_AS_LONG
#endif #endif
#if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION == 7
#define PyLong_AS_LONG PyInt_AS_LONG
#endif
#include <alsa/asoundlib.h> #include <alsa/asoundlib.h>
#include <stdio.h> #include <stdio.h>
@@ -88,6 +85,7 @@ get_pcmtype(PyObject *obj)
return SND_PCM_STREAM_PLAYBACK; return SND_PCM_STREAM_PLAYBACK;
} }
#if PY_MAJOR_VERSION > 2
if (PyLong_Check(obj)) { if (PyLong_Check(obj)) {
long pcmtype = PyLong_AS_LONG(obj); long pcmtype = PyLong_AS_LONG(obj);
if (pcmtype == SND_PCM_STREAM_PLAYBACK || if (pcmtype == SND_PCM_STREAM_PLAYBACK ||
@@ -95,6 +93,15 @@ get_pcmtype(PyObject *obj)
return pcmtype; return pcmtype;
} }
} }
#else
if (PyInt_Check(obj)) {
long pcmtype = PyInt_AS_LONG(obj);
if (pcmtype == SND_PCM_STREAM_PLAYBACK ||
pcmtype == SND_PCM_STREAM_CAPTURE) {
return pcmtype;
}
}
#endif
if (PyUnicode_Check(obj)) { if (PyUnicode_Check(obj)) {
const char *dirstr = PyUnicode_AS_DATA(obj); const char *dirstr = PyUnicode_AS_DATA(obj);
@@ -178,7 +185,7 @@ alsapcm_list(PyObject *self, PyObject *args)
return NULL; return NULL;
pcmtype = get_pcmtype(pcmtypeobj); pcmtype = get_pcmtype(pcmtypeobj);
if (pcmtype < 0){ if (pcmtype < 0) {
return NULL; return NULL;
} }