From: Andre Noll Date: Sat, 23 Mar 2019 15:51:56 +0000 (+0100) Subject: mixer: sleep/snooze: Close mixer during sleep. X-Git-Tag: v0.6.3~24^2 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=ac289a22fd438a97d5eda86793a47377d0d570ce mixer: sleep/snooze: Close mixer during sleep. This makes these subcommands work in case the audio device goes away temporarily during the sleep interval. This does not work at the moment because we connect to the mixer only once at startup. The mixer handle becomes invalid when the audio device goes away, so fade-in fails. Another drawback of this "connect only once" design is that the mixer device is opened even for the help subcommand, which is not only silly but also has the effect that the help subcommand fails if the mixer device can not be opened. To improve on this, we have the individual subcommand handlers open and close the mixer device. Consequently, the command handlers no longer take a struct mixer_handle * argument. To obtain a mixer handle, command handlers must now call the new open_mixer_and_set_channel() at startup, and m->close() on return to free the handle. --- diff --git a/mixer.c b/mixer.c index efa42b93..55282e77 100644 --- a/mixer.c +++ b/mixer.c @@ -40,7 +40,7 @@ static struct lls_parse_result *lpr, *sub_lpr; #define OPT_STRING_VAL(_cmd, _opt) (lls_string_val(0, OPT_RESULT(_cmd, _opt))) #define OPT_UINT32_VAL(_cmd, _opt) (lls_uint32_val(0, OPT_RESULT(_cmd, _opt))) -typedef int (*mixer_subcommand_handler_t)(const struct mixer *, struct mixer_handle *); +typedef int (*mixer_subcommand_handler_t)(const struct mixer *); #define EXPORT_CMD(_cmd) const mixer_subcommand_handler_t \ lsg_mixer_com_ ## _cmd ## _user_data = &com_ ## _cmd; @@ -153,11 +153,37 @@ sleep: return ret; } -static int com_fade(const struct mixer *m, struct mixer_handle *h) +static int open_mixer_and_set_channel(const struct mixer *m, struct mixer_handle **h) +{ + int ret; + + ret = m->open(OPT_STRING_VAL(PARA_MIXER, MIXER_DEVICE), h); + if (ret < 0) + return ret; + ret = set_channel(m, *h, OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL)); + if (ret == -E_BAD_CHANNEL) { + char *channels = m->get_channels(*h); + printf("Available channels: %s\n", channels); + free(channels); + } + if (ret < 0) + m->close(h); + return ret; +} + +static int com_fade(const struct mixer *m) { uint32_t new_vol = OPT_UINT32_VAL(FADE, FADE_VOL); uint32_t fade_time = OPT_UINT32_VAL(FADE, FADE_TIME); - return fade(m, h, new_vol, fade_time); + struct mixer_handle *h; + int ret; + + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + return ret; + ret = fade(m, h, new_vol, fade_time); + m->close(&h); + return ret; } EXPORT_CMD(fade); @@ -237,7 +263,7 @@ static int set_initial_volume(const struct mixer *m, struct mixer_handle *h) return 1; } -static int com_sleep(const struct mixer *m, struct mixer_handle *h) +static int com_sleep(const struct mixer *m) { time_t t1, wake_time_epoch; unsigned int delay; @@ -252,9 +278,13 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) int fiv = OPT_UINT32_VAL(SLEEP, FI_VOL); int fov = OPT_UINT32_VAL(SLEEP, FO_VOL); int32_t hour, min = 0; - char *tmp; - char *wt = para_strdup(wake_time + (wake_time[0] == '+')); + char *tmp, *wt; + struct mixer_handle *h; + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + return ret; + wt = para_strdup(wake_time + (wake_time[0] == '+')); /* calculate wake time */ time(&t1); tmp = strchr(wt, ':'); @@ -264,13 +294,13 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) ret = para_atoi32(tmp, &min); if (ret < 0) { free(wt); - return ret; + goto close_mixer; } } ret = para_atoi32(wt, &hour); free(wt); if (ret < 0) - return ret; + goto close_mixer; if (wake_time[0] == '+') { /* relative */ t1 += hour * 60 * 60 + min * 60; tm = localtime(&t1); @@ -291,19 +321,19 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) if (fot && fo_mood) { ret = set_initial_volume(m, h); if (ret < 0) - return ret; + goto close_mixer; change_afs_mode(fo_mood); client_cmd("play"); ret = set_channel(m, h, OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL)); if (ret < 0) - return ret; + goto close_mixer; ret = fade(m, h, fov, fot); if (ret < 0) - return ret; + goto close_mixer; } else { ret = m->set(h, fov); if (ret < 0) - return ret; + goto close_mixer; } if (sleep_mood) { change_afs_mode(sleep_mood); @@ -311,6 +341,7 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) client_cmd("play"); } else if (fot && fo_mood) /* currently playing */ client_cmd("stop"); + m->close(&h); if (!fit || !fi_mood) /* nothing to do */ return 1; for (;;) { @@ -328,21 +359,30 @@ static int com_sleep(const struct mixer *m, struct mixer_handle *h) client_cmd("next"); else /* currently stopped */ client_cmd("play"); + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + return ret; ret = fade(m, h, fiv, fit); - PARA_INFO_LOG("fade complete, returning\n"); +close_mixer: + m->close(&h); return ret; } EXPORT_CMD(sleep); -static int com_snooze(const struct mixer *m, struct mixer_handle *h) +static int com_snooze(const struct mixer *m) { int ret, val; + struct mixer_handle *h; + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + return ret; + ret = 1; if (OPT_UINT32_VAL(SNOOZE, SO_TIME) == 0) - return 1; + goto close_mixer; ret = m->get(h); if (ret < 0) - return ret; + goto close_mixer; val = ret; if (val < OPT_UINT32_VAL(SNOOZE, SO_VOL)) ret = m->set(h, OPT_UINT32_VAL(SNOOZE, SO_VOL)); @@ -350,20 +390,35 @@ static int com_snooze(const struct mixer *m, struct mixer_handle *h) ret = fade(m, h, OPT_UINT32_VAL(SNOOZE, SO_VOL), OPT_UINT32_VAL(SNOOZE, SO_TIME)); if (ret < 0) - return ret; + goto close_mixer; client_cmd("pause"); PARA_NOTICE_LOG("%" PRIu32 " seconds snooze time...\n", OPT_UINT32_VAL(SNOOZE, SNOOZE_TIME)); + m->close(&h); sleep(OPT_UINT32_VAL(SNOOZE, SNOOZE_TIME)); client_cmd("play"); - return fade(m, h, OPT_UINT32_VAL(SNOOZE, SI_VOL), + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + goto close_mixer; + ret = fade(m, h, OPT_UINT32_VAL(SNOOZE, SI_VOL), OPT_UINT32_VAL(SNOOZE, SI_TIME)); +close_mixer: + m->close(&h); + return ret; } EXPORT_CMD(snooze); -static int com_set(const struct mixer *m, struct mixer_handle *h) +static int com_set(const struct mixer *m) { - return m->set(h, OPT_UINT32_VAL(SET, VAL)); + struct mixer_handle *h; + int ret; + + ret = open_mixer_and_set_channel(m, &h); + if (ret < 0) + return ret; + ret = m->set(h, OPT_UINT32_VAL(SET, VAL)); + m->close(&h); + return ret; } EXPORT_CMD(set); @@ -402,9 +457,7 @@ static void show_subcommands(void) } } - -static int com_help(__a_unused const struct mixer *m, - __a_unused struct mixer_handle *h) +static int com_help(__a_unused const struct mixer *m) { const struct lls_command *cmd; const struct lls_opt_result *r_l = OPT_RESULT(HELP, LONG); @@ -487,7 +540,6 @@ int main(int argc, char *argv[]) char *errctx; const char *subcmd; const struct mixer *m; - struct mixer_handle *h; unsigned n; ret = lls(lls_parse(argc, argv, cmd, &lpr, &errctx)); @@ -515,23 +567,10 @@ int main(int argc, char *argv[]) if (ret < 0) goto free_lpr; ret = parse_and_merge_config_file(cmd); - if (ret < 0) - goto free_lpr; - m = get_mixer_or_die(); - ret = m->open(OPT_STRING_VAL(PARA_MIXER, MIXER_DEVICE), &h); if (ret < 0) goto free_sub_lpr; - ret = set_channel(m, h, OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL)); - if (ret == -E_BAD_CHANNEL) { - char *channels = m->get_channels(h); - printf("Available channels: %s\n", channels); - free(channels); - } - if (ret < 0) - goto close_mixer; - ret = (*(mixer_subcommand_handler_t *)(lls_user_data(cmd)))(m, h); -close_mixer: - m->close(&h); + m = get_mixer_or_die(); + ret = (*(mixer_subcommand_handler_t *)(lls_user_data(cmd)))(m); free_sub_lpr: lls_free_parse_result(sub_lpr, cmd); free_lpr: