commit 1bd580fcba8f8dc4587d5d8c42edd85857b11b65
author Simon Wilson <simonwilson@google.com> Thu Jun 02 15:58:41 2011 -0700
committer Simon Wilson <simonwilson@google.com> Thu Jun 02 15:58:41 2011 -0700
tree 73f41a41500cef31d7782bf788fc17dd5dc71314
parent 851aa5cc1596af6236c6105a92fb3b575ecb5c1c

Support multiple cards and devices

pcm.c

diff --git a/pcm.c b/pcm.c
index eab306f..2933dec 100644
--- a/pcm.c
+++ b/pcm.c
@@ -266,13 +266,14 @@
     };
 }
 
-struct pcm *pcm_open(unsigned int device, unsigned int flags, struct pcm_config *config)
+struct pcm *pcm_open(unsigned int card, unsigned int device,
+                     unsigned int flags, struct pcm_config *config)
 {
-    const char *dname;
     struct pcm *pcm;
     struct snd_pcm_info info;
     struct snd_pcm_hw_params params;
     struct snd_pcm_sw_params sparams;
+    char fn[256];
 
     pcm = calloc(1, sizeof(struct pcm));
     if (!pcm || !config)
@@ -280,16 +281,13 @@
 
     pcm->config = *config;
 
-    if (flags & PCM_IN) {
-        dname = "/dev/snd/pcmC0D0c";
-    } else {
-        dname = "/dev/snd/pcmC0D0p";
-    }
+    snprintf(fn, sizeof(fn), "/dev/snd/pcmC%uD%u%c", card, device,
+             flags & PCM_IN ? 'c' : 'p');
 
     pcm->flags = flags;
-    pcm->fd = open(dname, O_RDWR);
+    pcm->fd = open(fn, O_RDWR);
     if (pcm->fd < 0) {
-        oops(pcm, errno, "cannot open device '%s'", dname);
+        oops(pcm, errno, "cannot open device '%s'", fn);
         return pcm;
     }