X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=fade.c;h=fee8f8ca2af34ca8aef421ede07fc8f00763ab7b;hp=f95ef4c843588fa821c0a07fc090d24b88f220b8;hb=7007aedb78262af262e7e7db8d010c6498e79290;hpb=a694ab16b6ff43b545ccd530360b7224433a5b76 diff --git a/fade.c b/fade.c index f95ef4c8..fee8f8ca 100644 --- a/fade.c +++ b/fade.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1998-2009 Andre Noll + * Copyright (C) 1998-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -7,32 +7,33 @@ /** \file fade.c A volume fader and alarm clock for OSS. */ #include -#include -#include -#include -#include -#include /* EXIT_SUCCESS */ -#include -#include -#include -#include -#include #include "fade.cmdline.h" #include "para.h" #include "fd.h" #include "string.h" +#include "mix.h" #include "error.h" +#include "version.h" INIT_FADE_ERRLISTS; static struct fade_args_info conf; -__printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...) +enum mixer_id {MIXER_ENUM}; +static char *mixer_name[] = {MIXER_NAMES}; +DECLARE_MIXER_INITS; +static struct mixer supported_mixer[] = {MIXER_ARRAY}; +#define FOR_EACH_MIXER(i) for ((i) = 0; (i) < NUM_SUPPORTED_MIXERS; (i)++) + +static int loglevel; +__printf_2_3 void date_log(int ll, const char *fmt, ...) { va_list argp; time_t t1; struct tm *tm; + if (ll < loglevel) + return; time(&t1); tm = localtime(&t1); printf("%d:%02d:%02d ", tm->tm_hour, tm->tm_min, tm->tm_sec); @@ -40,114 +41,21 @@ __printf_2_3 void para_log(__a_unused int ll, const char *fmt, ...) vprintf(fmt, argp); va_end(argp); } +__printf_2_3 void (*para_log)(int, const char*, ...) = date_log; -/* - * Open the mixer device. - */ -static int open_mixer(void) -{ - return para_open(conf.mixer_device_arg, O_RDWR, 42); -} - -/* - * Get channel volume via mixer_fd. - */ -static int get_mixer_channel(int mixer_fd) -{ - int volume; - - if (ioctl(mixer_fd, MIXER_READ(conf.mixer_channel_arg), &volume) < 0) - return -ERRNO_TO_PARA_ERROR(errno); - /* take the mean value of left and right volume */ - return (volume % 256 + (volume >> 8)) / 2; -} - -/* - * Open mixer, get volume and close mixer. - */ -static int open_and_get_mixer_channel(void) -{ - int mixer_fd; - int volume; - - mixer_fd = open_mixer(); - if (mixer_fd < 0) - return mixer_fd; - volume = get_mixer_channel(mixer_fd); - close(mixer_fd); - return volume; -} - -/* - * Set channel volume via mixer_fd. - */ -static int set_mixer_channel(int mixer_fd, int volume) -{ - int tmp = (volume << 8) + volume; - - if (ioctl(mixer_fd, MIXER_WRITE(conf.mixer_channel_arg), &tmp) < 0) - return -ERRNO_TO_PARA_ERROR(errno); - return 1; -} - -/* - * Open mixer, set volume and close mixer. - */ -static int open_and_set_mixer_channel(int volume) -{ - int mixer_fd, ret = open_mixer(); - - if (ret < 0) - return ret; - mixer_fd = ret; - ret = set_mixer_channel(mixer_fd, volume); - close(mixer_fd); - return ret; -} - -static void fixup_mixer_channel_arg(void) +/* Fade to new volume in fade_time seconds. */ +static int fade(struct mixer *m, struct mixer_handle *h, int new_vol, int fade_time) { - int val = SOUND_MIXER_VOLUME; /* STFU, gcc */ - - switch (conf.mixer_channel_arg) { - case mixer_channel_arg_volume: val = SOUND_MIXER_VOLUME; break; - case mixer_channel_arg_bass: val = SOUND_MIXER_BASS; break; - case mixer_channel_arg_treble: val = SOUND_MIXER_TREBLE; break; - case mixer_channel_arg_synth: val = SOUND_MIXER_SYNTH; break; - case mixer_channel_arg_pcm: val = SOUND_MIXER_PCM; break; - case mixer_channel_arg_speaker: val = SOUND_MIXER_SPEAKER; break; - case mixer_channel_arg_line: val = SOUND_MIXER_LINE; break; - case mixer_channel_arg_mic: val = SOUND_MIXER_MIC; break; - case mixer_channel_arg_cd: val = SOUND_MIXER_CD; break; - case mixer_channel_arg_imix: val = SOUND_MIXER_IMIX; break; - case mixer_channel_arg_altpcm: val = SOUND_MIXER_ALTPCM; break; - case mixer_channel_arg_reclev: val = SOUND_MIXER_RECLEV; break; - case mixer_channel_arg_igain: val = SOUND_MIXER_IGAIN; break; - case mixer_channel_arg_ogain: val = SOUND_MIXER_OGAIN; break; - } - conf.mixer_channel_arg = val; -} - -/* - * Open mixer, get volume, fade to new_vol in secs seconds and - * close mixer. - */ -static int fade(int new_vol, int fade_time) -{ - int vol, mixer_fd, diff, incr, ret; + int vol, diff, incr, ret; unsigned secs; struct timespec ts; unsigned long long tmp, tmp2; /* Careful with that axe, Eugene! */ if (fade_time <= 0) - return 1; + return m->set(h, new_vol); secs = fade_time; PARA_NOTICE_LOG("fading to %d in %d seconds\n", new_vol, secs); - ret = open_mixer(); - if (ret < 0) - return ret; - mixer_fd = ret; - ret = get_mixer_channel(mixer_fd); + ret = m->get(h); if (ret < 0) goto out; vol = ret; @@ -165,33 +73,42 @@ static int fade(int new_vol, int fade_time) ts.tv_sec = tmp / 1000; /* really nec ?*/ //printf("ts.tv_sec: %i\n", ts.tv_nsec); vol += incr; - ret = set_mixer_channel(mixer_fd, vol); + ret = m->set(h, vol); if (ret < 0) goto out; //printf("vol = %i\n", vol); nanosleep(&ts, NULL); } out: - close(mixer_fd); return ret; } static void client_cmd(const char *cmd) { - int ret, fds[3] = {0, 0, 0}; + int ret, status, fds[3] = {0, 0, 0}; pid_t pid; char *cmdline = make_message(BINDIR "/para_client %s", cmd); - PARA_INFO_LOG("%s\n", cmdline); + PARA_NOTICE_LOG("%s\n", cmdline); ret = para_exec_cmdline_pid(&pid, cmdline, fds); free(cmdline); if (ret < 0) { - PARA_EMERG_LOG("%s\n", para_strerror(-ret)); - exit(EXIT_FAILURE); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + goto fail; } do - ret = wait(NULL); - while (ret != -1 && errno != ECHILD); + pid = waitpid(pid, &status, 0); + while (pid == -1 && errno == EINTR); + if (pid < 0) { + PARA_ERROR_LOG("%s\n", strerror(errno)); + goto fail; + } + if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) + goto fail; + return; +fail: + PARA_EMERG_LOG("command \"%s\" failed\n", cmd); + exit(EXIT_FAILURE); } static void change_afs_mode_and_play(char *afs_mode) @@ -201,16 +118,13 @@ static void change_afs_mode_and_play(char *afs_mode) client_cmd("stop"); if (!afs_mode) return; - cmd = make_message("select %s\n", afs_mode); + cmd = make_message("select %s", afs_mode); client_cmd(cmd); free(cmd); client_cmd("play"); } -/* - * sleep - */ -static int sweet_dreams(void) +static int sweet_dreams(struct mixer *m, struct mixer_handle *h) { time_t t1, wake_time_epoch; unsigned int delay; @@ -248,15 +162,15 @@ static int sweet_dreams(void) sleep(1); if (fot) { PARA_INFO_LOG("initial volume: %d\n", iv); - ret = open_and_set_mixer_channel(iv); + ret = m->set(h, iv); if (ret < 0) return ret; change_afs_mode_and_play(fo_mood); - ret = fade(fov, fot); + ret = fade(m, h, fov, fot); if (ret < 0) return ret; } else { - ret = open_and_set_mixer_channel(fov); + ret = m->set(h, fov); if (ret < 0) return ret; } @@ -277,30 +191,32 @@ static int sweet_dreams(void) sleep(delay); } change_afs_mode_and_play(fi_mood); - ret = fade(fiv, fit); + ret = fade(m, h, fiv, fit); PARA_INFO_LOG("fade complete, returning\n"); return ret; } -static int snooze(void) +static int snooze(struct mixer *m, struct mixer_handle *h) { - int ret; - unsigned sleep_time; + int ret, val; if (conf.so_time_arg <= 0) return 1; - sleep_time = conf.so_time_arg; - if (open_and_get_mixer_channel() < conf.so_vol_arg) - ret = open_and_set_mixer_channel(conf.so_vol_arg); + ret = m->get(h); + if (ret < 0) + return ret; + val = ret; + if (val < conf.so_vol_arg) + ret = m->set(h, conf.so_vol_arg); else - ret = fade(conf.so_vol_arg, conf.so_time_arg); + ret = fade(m, h, conf.so_vol_arg, conf.so_time_arg); if (ret < 0) return ret; client_cmd("pause"); PARA_NOTICE_LOG("%d seconds snooze time...\n", conf.snooze_time_arg); - sleep(sleep_time); + sleep(conf.snooze_time_arg); client_cmd("play"); - return fade(conf.si_vol_arg, conf.si_time_arg); + return fade(m, h, conf.si_vol_arg, conf.si_time_arg); } static int configfile_exists(void) @@ -317,9 +233,64 @@ static int configfile_exists(void) return file_exists(conf.config_file_arg); } +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 set_channel(struct mixer *m, struct mixer_handle *h) +{ + char *channels; + int ret; + + ret = m->set_channel(h, conf.mixer_channel_arg); + if (ret >= 0) { + PARA_NOTICE_LOG("using %s mixer channel\n", + conf.mixer_channel_arg? conf.mixer_channel_arg + : "default"); + return ret; + } + channels = m->get_channels(h); + printf("Available channels: %s\n", channels); + free(channels); + return ret; +} + +static struct mixer *get_mixer_or_die(void) +{ + int i; + + if (!conf.mixer_api_given) + i = DEFAULT_MIXER; + else + FOR_EACH_MIXER(i) + if (!strcmp(mixer_name[i], conf.mixer_api_arg)) + break; + if (i < NUM_SUPPORTED_MIXERS) { + PARA_NOTICE_LOG("using %s mixer API\n", mixer_name[i]); + return supported_mixer + i; + } + printf("available mixer APIs: "); + FOR_EACH_MIXER(i) { + int d = (i == DEFAULT_MIXER); + printf("%s%s%s ", d? "[" : "", mixer_name[i], d? "]" : ""); + } + printf("\n"); + exit(EXIT_FAILURE); +} + int main(int argc, char *argv[]) { int ret; + struct mixer *m; + struct mixer_handle *h = NULL; if (fade_cmdline_parser(argc, argv, &conf)) exit(EXIT_FAILURE); @@ -341,18 +312,28 @@ int main(int argc, char *argv[]) fade_cmdline_parser_config_file(conf.config_file_arg, &conf, ¶ms); } - fixup_mixer_channel_arg(); + loglevel = get_loglevel_by_name(conf.loglevel_arg); + init_mixers(); + m = get_mixer_or_die(); + ret = m->open(conf.mixer_device_arg, &h); + if (ret < 0) + goto out; + ret = set_channel(m, h); + if (ret < 0) + goto out; switch (conf.mode_arg) { - case mode_arg_sleep: - ret = sweet_dreams(); - break; case mode_arg_fade: - ret = fade(conf.fade_vol_arg, conf.fade_time_arg); + ret = fade(m, h, conf.fade_vol_arg, conf.fade_time_arg); break; case mode_arg_snooze: - ret = snooze(); + ret = snooze(m, h); + break; + default: /* sleep mode */ + ret = sweet_dreams(m, h); break; } +out: + m->close(&h); if (ret < 0) PARA_EMERG_LOG("%s\n", para_strerror(-ret)); return ret < 0? EXIT_FAILURE : EXIT_SUCCESS;