In a mode of 'monitor', when given no argument, all of available control
node is observed for their events. At present, discovering the nodes is
done according to sound card number, instead of listing nodes in
configuration space of alsa-lib.
This commit adds a structure to discover sound cards with a simple
interface.
Signed-off-by: Takashi Sakamoto <o-takashi@xxxxxxxxxxxxx>
---
alsactl/monitor.c | 48 +++++++++++++++++++++++++++++++++++------------
1 file changed, 36 insertions(+), 12 deletions(-)
diff --git a/alsactl/monitor.c b/alsactl/monitor.c
index ae1653c..79e8fd9 100644
--- a/alsactl/monitor.c
+++ b/alsactl/monitor.c
@@ -28,6 +28,36 @@
static int signal_type;
static bool interrupted;
+#define MAX_CARDS 256
+
+struct snd_card_iterator {
+ int card;
+ char name[16];
+};
+
+void snd_card_iterator_init(struct snd_card_iterator *iter)
+{
+ iter->card = -1;
+ memset(iter->name, 0, sizeof(iter->name));
+}
+
+static const char *snd_card_iterator_next(struct snd_card_iterator *iter)
+{
+ if (snd_card_next(&iter->card) < 0)
+ return NULL;
+ if (iter->card < 0)
+ return NULL;
+ if (iter->card >= MAX_CARDS) {
+ fprintf(stderr, "alsactl: too many cards\n");
+ return NULL;
+ }
+
+
+ snprintf(iter->name, sizeof(iter->name), "hw:%d", iter->card);
+
+ return (const char *)iter->name;
+}
+
static int open_ctl(const char *name, snd_ctl_t **ctlp)
{
snd_ctl_t *ctl;
@@ -155,8 +185,6 @@ static int prepare_signal_handler(void)
return 0;
}
-#define MAX_CARDS 256
-
int monitor(const char *name)
{
snd_ctl_t *ctls[MAX_CARDS];
@@ -170,19 +198,15 @@ int monitor(const char *name)
return err;
if (!name) {
- int card = -1;
- while (snd_card_next(&card) >= 0 && card >= 0) {
- char cardname[16];
- if (ncards >= MAX_CARDS) {
- fprintf(stderr, "alsactl: too many cards\n");
- err = -E2BIG;
- goto error;
- }
- sprintf(cardname, "hw:%d", card);
+ struct snd_card_iterator iter;
+ const char *cardname;
+
+ snd_card_iterator_init(&iter);
+ while ((cardname = snd_card_iterator_next(&iter))) {
err = open_ctl(cardname, &ctls[ncards]);
if (err < 0)
goto error;
- ncards++;
+ ++ncards;
}
show_cards = 1;
} else {
--
2.19.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
