Conformance to new pcm_info semantic

diff --git a/alsactl/setup.c b/alsactl/setup.c
index 77c280e5a84b8f2cabaf99b14704cc697f9330fa..d854cd6bbfd856476da1f6dcd25ee855e7305d22 100644 (file)
--- a/alsactl/setup.c
+++ b/alsactl/setup.c
@@ -364,6 +364,8 @@ static int soundcard_setup_collect_switches1(int cardno)
                bzero(pcm, sizeof(struct pcm));
                pcm->no = device;
                pcm->info.device = device;
+               pcm->info.stream = -1;
+               pcm->info.subdevice = -1;
                if ((err = snd_ctl_pcm_info(handle, &pcm->info)) < 0) {
                        snd_ctl_close(handle);
                        error("PCM info error: %s", snd_strerror(err));

diff --git a/aplay/aplay.c b/aplay/aplay.c
index 708c766136def428c00a152978a98b9b9d3c58f9..7686330ca21e79e2a8f64db75228b0b5993ac2cd 100644 (file)
--- a/aplay/aplay.c
+++ b/aplay/aplay.c
@@ -229,12 +229,14 @@ static void device_list(void)
                }
                for (dev = 0; dev < info.pcmdevs; dev++) {
                        pcminfo.device = dev;
-                       pcminfo.stream = stream;
+                       pcminfo.stream = -stream - 1;
                        pcminfo.subdevice = -1;
                        if ((err = snd_ctl_pcm_info(handle, &pcminfo)) < 0) {
                                fprintf(stderr, "Error: control digital audio info (%i): %s\n", card, snd_strerror(err));
                                continue;
                        }
+                       if (pcminfo.stream != stream)
+                               continue;
                        fprintf(stderr, "%s: %i [%s] / #%i: %s\n",
                               info.name,
                               card + 1,