Changeset 1192

Timestamp:

08/04/08 06:29:40 (4 months ago)

Author:

cdavid

Message:

Add ability to play arrays of short for alsa backend.

Files:

• trunk/audiolab/scikits/audiolab/soundio/_alsa.pyx (modified) (6 diffs)
• trunk/audiolab/scikits/audiolab/soundio/setup.py (modified) (1 diff)

trunk/audiolab/scikits/audiolab/soundio/_alsa.pyx

@@ -60 +60 @@
-
-        ctypedef struct snd_pcm_t
+        # XXX: how to make sure the typedef is OK ?
+        ctypedef unsigned long snd_pcm_uframes_t
-
-        int snd_pcm_open(snd_pcm_t **, char*, int, int)
-        int snd_pcm_close(snd_pcm_t *)
+        int snd_pcm_drain(snd_pcm_t *)
-
-        int snd_pcm_set_params(snd_pcm_t *, snd_pcm_format_t,
-                        snd_pcm_access_t, unsigned int,
-                        unsigned int, int, unsigned int)
+
+        int snd_pcm_writei(snd_pcm_t *, void*, snd_pcm_uframes_t)
-
-        char* snd_strerror(int error)
@@ -73 +78 @@
-        int snd_card_get_name(int icard, char** name)
-        char* snd_asoundlib_version()
+
+cdef extern from "numpy/arrayobject.h":
+        ctypedef int intp
+        ctypedef extern class numpy.ndarray [object PyArrayObject]:
+                cdef char *data
+                cdef int nd
+                cdef intp *dimensions
+                cdef intp *strides
+                cdef int flags
-
-cdef extern from "stdlib.h":
@@ -81 +95 @@
-        size_t strlen(char *s)
-        char *strcpy(char *dest, char *src)
+
+cdef extern from "stdint.h":
+        ctypedef unsigned short int16_t
-
-cdef extern from "Python.h":
@@ -117 +134 @@
-        return cardname
-
-
+_
-        cdef snd_pcm_t* pcmhdl
-        cdef public char* name
@@ -136 +153 @@
-
-cdef class Device:
-
+_
-        cdef unsigned int samplerate
-
+
+
+
+
-        def __init__(self, samplerate = 48000, channels = 1,
-                     format = SND_PCM_FORMAT_S16,
-                     access = SND_PCM_ACCESS_RW_INTERLEAVED):
-
+_
-
-                self.samplerate = samplerate
-                self.channels = channels
+
+                self.access = access
+                self.format = format
-
-                st = snd_pcm_set_params(self.pcm.pcmhdl, format, access, channels,
@@ -152 +175 @@
-                        raise AlsaException()
-
+        def play_short(self, ndarray input):
+                cdef int16_t* p = <int16_t*>input.data
+                cdef int16_t* buff = NULL
+                #cdef int n = input.dimensions[0]
+                cdef int n = input.dimensions[0]
+                cdef int nb = n / 1024 / 16
+                cdef snd_pcm_uframes_t bufsz = 1024 * 16
+
+                assert self.format == SND_PCM_FORMAT_S16
+                assert self.access == SND_PCM_ACCESS_RW_INTERLEAVED
+
+                for i from 0 <= i  < nb:
+                        st =  snd_pcm_writei(self.pcm.pcmhdl, &p[i * bufsz], bufsz)
+                        if not st == bufsz:
+                                print "Error while writing to device", st
+                                print snd_strerror(st)
+
+                snd_pcm_drain(self.pcm.pcmhdl)
+
-        def _get_name(self):
-                return self.pcm.name

trunk/audiolab/scikits/audiolab/soundio/setup.py

@@ -2 +2 @@
-from distutils.extension import Extension
-from Cython.Distutils import build_ext
+from numpy.distutils.misc_util import get_numpy_include_dirs
-
-setup(name = "PyrexGuide",
-
+
+
+
+
-      cmdclass = {'build_ext': build_ext})
-