From 35c721265c257de468f11571753d007bc6fa001c Mon Sep 17 00:00:00 2001 From: Abramo Bagnara Date: Thu, 22 Jun 2000 06:07:13 +0000 Subject: [PATCH] Conformance to new pcm_info semantic --- alsactl/setup.c | 2 ++ aplay/aplay.c | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/alsactl/setup.c b/alsactl/setup.c index 77c280e..d854cd6 100644 --- 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 708c766..7686330 100644 --- 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, -- 2.47.1