openharmony/third_party_tinyalsa
1
0
Fork 0
mirror of https://github.com/openharmony/third_party_tinyalsa.git synced 2026-07-19 15:24:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

mixer: add mixer_get_name() API

Browse Source
This commit is contained in:
Simon Wilson
2013-06-28 16:21:31 -07:00
parent 710df882fa
commit ec281392bb
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/tinyalsa/asoundlib.h
+3
View File
@@ -201,6 +201,9 @@ struct mixer_ctl;
struct mixer *mixer_open(unsigned int card);
void mixer_close(struct mixer *mixer);
/* Get info about a mixer */
const char *mixer_get_name(struct mixer *mixer);
/* Obtain mixer controls */
unsigned int mixer_get_num_ctls(struct mixer *mixer);
struct mixer_ctl *mixer_get_ctl(struct mixer *mixer, unsigned int id);
mixer.c
+16 -7
View File
@@ -52,7 +52,8 @@ struct mixer_ctl {
struct mixer {
int fd;
struct snd_ctl_elem_info *info;
struct snd_ctl_card_info card_info;
struct snd_ctl_elem_info *elem_info;
struct mixer_ctl *ctl;
unsigned int count;
};
@@ -79,8 +80,8 @@ void mixer_close(struct mixer *mixer)
free(mixer->ctl);
}
if (mixer->info)
free(mixer->info);
if (mixer->elem_info)
free(mixer->elem_info);
free(mixer);
@@ -111,8 +112,11 @@ struct mixer *mixer_open(unsigned int card)
goto fail;
mixer->ctl = calloc(elist.count, sizeof(struct mixer_ctl));
mixer->info = calloc(elist.count, sizeof(struct snd_ctl_elem_info));
if (!mixer->ctl || !mixer->info)
mixer->elem_info = calloc(elist.count, sizeof(struct snd_ctl_elem_info));
if (!mixer->ctl || !mixer->elem_info)
goto fail;
if (ioctl(fd, SNDRV_CTL_IOCTL_CARD_INFO, &mixer->card_info) < 0)
goto fail;
eid = calloc(elist.count, sizeof(struct snd_ctl_elem_id));
@@ -127,7 +131,7 @@ struct mixer *mixer_open(unsigned int card)
goto fail;
for (n = 0; n < mixer->count; n++) {
struct snd_ctl_elem_info *ei = mixer->info + n;
struct snd_ctl_elem_info *ei = mixer->elem_info + n;
ei->id.numid = eid[n].numid;
if (ioctl(fd, SNDRV_CTL_IOCTL_ELEM_INFO, ei) < 0)
goto fail;
@@ -165,6 +169,11 @@ fail:
return 0;
}
const char *mixer_get_name(struct mixer *mixer)
{
return (const char *)mixer->card_info.name;
}
unsigned int mixer_get_num_ctls(struct mixer *mixer)
{
if (!mixer)
@@ -189,7 +198,7 @@ struct mixer_ctl *mixer_get_ctl_by_name(struct mixer *mixer, const char *name)
return NULL;
for (n = 0; n < mixer->count; n++)
if (!strcmp(name, (char*) mixer->info[n].id.name))
if (!strcmp(name, (char*) mixer->elem_info[n].id.name))
return mixer->ctl + n;
return NULL;
tinymix.c
+2
View File
@@ -61,6 +61,8 @@ int main(int argc, char **argv)
return EXIT_FAILURE;
}
printf("Mixer name: '%s'\n", mixer_get_name(mixer));
if (argc == 1)
tinymix_list_controls(mixer);
else if (argc == 2)