asgardius/alsa-utils
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-utils synced 2024-11-09 17:05:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

alsaucm: do the implicit ucm open only when the command requires it

Browse source 
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
This commit is contained in:
Jaroslav Kysela 2019-11-09 22:20:00 +01:00
parent 94401f7afe
commit d2b0b91edf
1 changed files with 52 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
alsaucm/usecase.c
View file

@ -171,6 +171,54 @@ static int parse_line(struct context *context, char *line)
return 0; return 0;
} }
static void my_exit(struct context *context, int exitcode)
{
if (context->uc_mgr)
snd_use_case_mgr_close(context->uc_mgr);
if (context->arga > 0)
free(context->argv);
if (context->card)
free(context->card);
if (context->batch)
free(context->batch);
free(context);
snd_config_update_free_global();
exit(exitcode);
}
static void do_initial_open(struct context *context)
{
const char **list;
int err;
if (!context->no_open && context->card == NULL) {
err = snd_use_case_card_list(&list);
if (err < 0) {
fprintf(stderr, "%s: unable to obtain card list: %s\n",
context->command, snd_strerror(err));
my_exit(context, EXIT_FAILURE);
}
if (err == 0) {
printf("No card found\n");
my_exit(context, EXIT_SUCCESS);
}
context->card = strdup(list[0]);
snd_use_case_free_list(list, err);
}
/* open library */
if (!context->no_open) {
err = snd_use_case_mgr_open(&context->uc_mgr,
context->card);
if (err < 0) {
fprintf(stderr,
"%s: error failed to open sound card %s: %s\n",
context->command, context->card, snd_strerror(err));
my_exit(context, EXIT_FAILURE);
}
}
}
static int do_one(struct context *context, struct cmd *cmd, char **argv) static int do_one(struct context *context, struct cmd *cmd, char **argv)
{ {
const char **list, *str; const char **list, *str;
@ -178,6 +226,10 @@ static int do_one(struct context *context, struct cmd *cmd, char **argv)
int err, i, j, entries; int err, i, j, entries;
if (cmd->opencard && context->uc_mgr == NULL) { if (cmd->opencard && context->uc_mgr == NULL) {
if (!context->no_open) {
do_initial_open(context);
context->no_open = 1;
}
fprintf(stderr, "%s: command '%s' requires an open card\n", fprintf(stderr, "%s: command '%s' requires an open card\n",
context->command, cmd->id); context->command, cmd->id);
return 0; return 0;
@ -350,21 +402,6 @@ static int do_commands(struct context *context)
return 0; return 0;
} }
static void my_exit(struct context *context, int exitcode)
{
if (context->uc_mgr)
snd_use_case_mgr_close(context->uc_mgr);
if (context->arga > 0)
free(context->argv);
if (context->card)
free(context->card);
if (context->batch)
free(context->batch);
free(context);
snd_config_update_free_global();
exit(exitcode);
}
enum { enum {
OPT_VERSION = 1, OPT_VERSION = 1,
}; };
@ -383,7 +420,6 @@ int main(int argc, char *argv[])
}; };
struct context *context; struct context *context;
const char *command = argv[0]; const char *command = argv[0];
const char **list;
int c, err, option_index; int c, err, option_index;
char cmd[MAX_BUF]; char cmd[MAX_BUF];
FILE *in; FILE *in;
@ -423,32 +459,6 @@ int main(int argc, char *argv[])
} }
} }
if (!context->no_open && context->card == NULL) {
err = snd_use_case_card_list(&list);
if (err < 0) {
fprintf(stderr, "%s: unable to obtain card list: %s\n", command, snd_strerror(err));
my_exit(context, EXIT_FAILURE);
}
if (err == 0) {
printf("No card found\n");
my_exit(context, EXIT_SUCCESS);
}
context->card = strdup(list[0]);
snd_use_case_free_list(list, err);
}
/* open library */
if (!context->no_open) {
err = snd_use_case_mgr_open(&context->uc_mgr,
context->card);
if (err < 0) {
fprintf(stderr,
"%s: error failed to open sound card %s: %s\n",
command, context->card, snd_strerror(err));
my_exit(context, EXIT_FAILURE);
}
}
/* parse and execute any command line commands */ /* parse and execute any command line commands */
if (argc > optind) { if (argc > optind) {
context->argv = argv + optind; context->argv = argv + optind;