X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=mixer.c;h=00af08a4e428b637dcb24ebc68545edb478ff61d;hp=6d1b5f5cad2d344c3f1eb6b2b441e7ef62e5d79c;hb=a35c113e0bb9fa9ac02b77eb01dd32f49cd5c8d0;hpb=c37b0175de9a871649074c9e08681dd6511102e9 diff --git a/mixer.c b/mixer.c index 6d1b5f5c..00af08a4 100644 --- a/mixer.c +++ b/mixer.c @@ -1,13 +1,10 @@ -/* - * Copyright (C) 1998 Andre Noll - * - * Licensed under the GPL v2. For licencing details see COPYING. - */ +/* Copyright (C) 1998 Andre Noll , see file COPYING. */ /** \file mixer.c A volume fader and alarm clock for OSS. */ #include #include +#include #include "mixer.lsg.h" #include "para.h" @@ -20,10 +17,17 @@ /** Array of error strings. */ DEFINE_PARA_ERRLIST; -enum mixer_id {MIXER_ENUM}; -static char *mixer_name[] = {MIXER_NAMES}; -DECLARE_MIXER_INITS; -static struct mixer supported_mixer[] = {MIXER_ARRAY}; +/* At least one of the two is defined if this file gets compiled. */ +static const struct mixer *mixers[] = { +#ifdef HAVE_ALSA + &alsa_mixer, +#endif +#ifdef HAVE_OSS + &oss_mixer, +#endif +}; + +#define NUM_SUPPORTED_MIXERS (ARRAY_SIZE(mixers)) #define FOR_EACH_MIXER(i) for ((i) = 0; (i) < NUM_SUPPORTED_MIXERS; (i)++) static struct lls_parse_result *lpr, *sub_lpr; @@ -35,7 +39,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)(struct mixer *, struct mixer_handle *); +typedef int (*mixer_subcommand_handler_t)(const struct mixer *, struct mixer_handle *); #define EXPORT_CMD(_cmd) const mixer_subcommand_handler_t \ lsg_mixer_com_ ## _cmd ## _user_data = &com_ ## _cmd; @@ -58,7 +62,8 @@ static __printf_2_3 void date_log(int ll, const char *fmt, ...) } __printf_2_3 void (*para_log)(int, const char*, ...) = date_log; -static int set_channel(struct mixer *m, struct mixer_handle *h, const char *channel) +static int set_channel(const struct mixer *m, struct mixer_handle *h, + const char *channel) { PARA_NOTICE_LOG("using %s mixer channel\n", channel? @@ -66,48 +71,88 @@ static int set_channel(struct mixer *m, struct mixer_handle *h, const char *chan return m->set_channel(h, channel); } +static void millisleep(int ms) +{ + struct timespec ts; + + PARA_INFO_LOG("sleeping %dms\n", ms); + if (ms < 0) + return; + ts.tv_sec = ms / 1000, + ts.tv_nsec = (ms % 1000) * 1000 * 1000; + nanosleep(&ts, NULL); +} + +/* + * This implements the inverse function of t -> t^alpha, scaled to the time + * interval [0,T] and the range given by old_vol and new_vol. It returns the + * amount of milliseconds until the given volume is reached. + */ +static unsigned volume_time(double vol, double old_vol, double new_vol, + double T, double alpha) +{ + double c, d, x; + + if (old_vol < new_vol) { + c = old_vol; + d = new_vol; + } else { + c = new_vol; + d = old_vol; + } + + x = T * exp(log(((vol - c) / (d - c))) / alpha); + assert(x <= T); + if (old_vol < new_vol) + return x; + else + return T - x; +} + /* Fade to new volume in fade_time seconds. */ -static int fade(struct mixer *m, struct mixer_handle *h, uint32_t new_vol, +static int fade(const struct mixer *m, struct mixer_handle *h, uint32_t new_vol, uint32_t fade_time) { - int vol, diff, incr, ret; - unsigned secs; - struct timespec ts; - unsigned long long tmp, tmp2; /* Careful with that axe, Eugene! */ + int i, T, old_vol, ret, slept, incr; + double ms, alpha; + uint32_t fe = OPT_UINT32_VAL(PARA_MIXER, FADE_EXPONENT); - if (fade_time <= 0) - return m->set(h, new_vol); - secs = fade_time; + if (fade_time <= 0 || fe >= 100) { + ret = m->set(h, new_vol); + if (ret < 0) + return ret; + goto sleep; + } + alpha = (100 - fe) / 100.0; ret = m->get(h); if (ret < 0) - goto out; - vol = ret; + return ret; + old_vol = ret; + if (old_vol == new_vol) + goto sleep; PARA_NOTICE_LOG("fading %s from %d to %u in %u seconds\n", - OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL), vol, new_vol, secs); - diff = new_vol - vol; - if (!diff) { - sleep(secs); - goto out; - } - incr = diff > 0? 1: -1; - diff = diff > 0? diff: -diff; - tmp = secs * 1000 / diff; - tmp2 = tmp % 1000; - while ((new_vol - vol) * incr > 0) { - ts.tv_nsec = tmp2 * 1000000; /* really nec ?*/ - ts.tv_sec = tmp / 1000; /* really nec ?*/ - //printf("ts.tv_sec: %i\n", ts.tv_nsec); - vol += incr; - ret = m->set(h, vol); + OPT_STRING_VAL(PARA_MIXER, MIXER_CHANNEL), old_vol, + new_vol, fade_time); + incr = old_vol < new_vol? 1 : -1; + T = fade_time * 1000; + i = old_vol; + slept = 0; + do { + ms = volume_time(i + incr, old_vol, new_vol, T, alpha); + millisleep(ms - slept); + slept = ms; + i += incr; + ret = m->set(h, i); if (ret < 0) - goto out; - //printf("vol = %i\n", vol); - nanosleep(&ts, NULL); - } -out: + return ret; + } while (i != new_vol); + return 1; +sleep: + sleep(fade_time); return ret; } -static int com_fade(struct mixer *m, struct mixer_handle *h) + +static int com_fade(const struct mixer *m, struct mixer_handle *h) { uint32_t new_vol = OPT_UINT32_VAL(FADE, FADE_VOL); uint32_t fade_time = OPT_UINT32_VAL(FADE, FADE_TIME); @@ -155,7 +200,7 @@ static void change_afs_mode(const char *afs_mode) free(cmd); } -static int set_initial_volume(struct mixer *m, struct mixer_handle *h) +static int set_initial_volume(const struct mixer *m, struct mixer_handle *h) { int i, ret; @@ -194,7 +239,7 @@ static int set_initial_volume(struct mixer *m, struct mixer_handle *h) return 1; } -static int com_sleep(struct mixer *m, struct mixer_handle *h) +static int com_sleep(const struct mixer *m, struct mixer_handle *h) { time_t t1, wake_time_epoch; unsigned int delay; @@ -287,7 +332,7 @@ static int com_sleep(struct mixer *m, struct mixer_handle *h) } EXPORT_CMD(sleep); -static int com_snooze(struct mixer *m, struct mixer_handle *h) +static int com_snooze(const struct mixer *m, struct mixer_handle *h) { int ret, val; @@ -314,44 +359,31 @@ static int com_snooze(struct mixer *m, struct mixer_handle *h) } EXPORT_CMD(snooze); -static void init_mixers(void) -{ - int i; - - FOR_EACH_MIXER(i) { - struct mixer *m = &supported_mixer[i]; - PARA_DEBUG_LOG("initializing mixer API #%d (%s)\n", - i, mixer_name[i]); - m->init(m); - } -} - -static int com_set(struct mixer *m, struct mixer_handle *h) +static int com_set(const struct mixer *m, struct mixer_handle *h) { return m->set(h, OPT_UINT32_VAL(SET, VAL)); } EXPORT_CMD(set); -static struct mixer *get_mixer_or_die(void) +static const struct mixer *get_mixer_or_die(void) { int i; if (!OPT_GIVEN(PARA_MIXER, MIXER_API)) - i = DEFAULT_MIXER; + i = 0; /* default: use first mixer */ else FOR_EACH_MIXER(i) - if (!strcmp(mixer_name[i], + if (!strcmp(mixers[i]->name, OPT_STRING_VAL(PARA_MIXER, MIXER_API))) break; if (i < NUM_SUPPORTED_MIXERS) { - PARA_NOTICE_LOG("using %s mixer API\n", mixer_name[i]); - return supported_mixer + i; + PARA_NOTICE_LOG("using %s mixer API\n", mixers[i]->name); + return mixers[i]; } printf("available mixer APIs: "); - FOR_EACH_MIXER(i) { - int d = (i == DEFAULT_MIXER); - printf("%s%s%s ", d? "[" : "", mixer_name[i], d? "]" : ""); - } + FOR_EACH_MIXER(i) + printf("%s%s%s ", i == 0? "[" : "", mixers[i]->name, + i == 0? "]" : ""); printf("\n"); exit(EXIT_FAILURE); } @@ -369,7 +401,8 @@ static void show_subcommands(void) } -static int com_help(__a_unused struct mixer *m, __a_unused struct mixer_handle *h) +static int com_help(__a_unused const struct mixer *m, + __a_unused struct mixer_handle *h) { const struct lls_command *cmd; const struct lls_opt_result *r_l = OPT_RESULT(HELP, LONG); @@ -495,7 +528,7 @@ int main(int argc, char *argv[]) int ret; char *errctx; const char *subcmd; - struct mixer *m; + const struct mixer *m; struct mixer_handle *h; unsigned n; @@ -526,7 +559,6 @@ int main(int argc, char *argv[]) ret = parse_and_merge_config_file(cmd); if (ret < 0) goto free_lpr; - init_mixers(); m = get_mixer_or_die(); ret = m->open(OPT_STRING_VAL(PARA_MIXER, MIXER_DEVICE), &h); if (ret < 0)