X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=audiod.c;h=dfb61db4c1d811fdedf97d5fa381defc241ae03b;hp=dd723233c75e481f3c0e342c1f4eb993a448c076;hb=d080286b39f943baf22f1b531816d8209d8685d6;hpb=64e19e1bdabc9bb04941f285fb828a8317359816 diff --git a/audiod.c b/audiod.c index dd723233..dfb61db4 100644 --- a/audiod.c +++ b/audiod.c @@ -5,9 +5,11 @@ */ /** \file audiod.c the paraslash's audio daemon */ +#include +#include #include "para.h" - +#include "error.h" #include "audiod.cmdline.h" #include "list.h" #include "sched.h" @@ -24,7 +26,6 @@ #include "fd.h" #include "write.h" #include "write_common.h" -#include "error.h" #include "signal.h" /** define the array of error lists needed by para_audiod */ @@ -32,7 +33,7 @@ INIT_AUDIOD_ERRLISTS; /** define the array containing all supported audio formats */ const char *audio_formats[] = {AUDIOD_AUDIO_FORMAT_ARRAY NULL}; -/** defines how to handle one supported audio format */ +/** Defines how audiod handles one supported audio format. */ struct audio_format_info { /** pointer to the receiver for this audio format */ struct receiver *receiver; @@ -104,18 +105,6 @@ struct command_task { struct task task; }; -/** - * task for signal handling - */ -struct signal_task { - /** the signal pipe */ - int fd; - /** the number of the most recent signal */ - int signum; - /** the associated task structure */ - struct task task; -}; - /** iterate over all supported audio formats */ #define FOR_EACH_AUDIO_FORMAT(af) for (af = 0; af < NUM_AUDIO_FORMATS; af++) @@ -129,6 +118,9 @@ struct signal_task { int get_audio_format_num(char *name) { int i; + + while (para_isspace(*name)) + name++; FOR_EACH_AUDIO_FORMAT(i) if (!strcmp(name, audio_formats[i])) return i; @@ -497,7 +489,7 @@ out: return count; } -static void check_stat_line(char *line) +static int check_stat_line(char *line, __a_unused void *data) { int itemnum; size_t ilen = 0; @@ -506,14 +498,14 @@ static void check_stat_line(char *line) // PARA_INFO_LOG("line: %s\n", line); if (!line) - return; + return 1; itemnum = stat_line_valid(line); if (itemnum < 0) { PARA_WARNING_LOG("invalid status line: %s\n", line); - return; + return 1; } if (stat_task->clock_diff_count && itemnum != SI_CURRENT_TIME) - return; + return 1; tmp = make_message("%s\n", line); stat_client_write(tmp, itemnum); free(tmp); @@ -527,7 +519,7 @@ static void check_stat_line(char *line) case SI_OFFSET: stat_task->offset_seconds = atoi(line + ilen + 1); break; - case SI_LENGTH: + case SI_SECONDS_TOTAL: stat_task->length_seconds = atoi(line + ilen + 1); break; case SI_STREAM_START: @@ -557,6 +549,7 @@ static void check_stat_line(char *line) stat_task->clock_diff_count--; break; } + return 1; } static void try_to_close_slot(int slot_num) @@ -581,7 +574,7 @@ static void try_to_close_slot(int slot_num) /* * Check if any receivers/filters/writers need to be started and do so if - * neccessary. Since the pre_select function didn't have a chance yet to put + * necessary. Since the pre_select function didn't have a chance yet to put * file descriptors into the fd sets given by s, make the upcoming select() * return immediately to avoid a long timeout in case we started something. */ @@ -876,7 +869,7 @@ static int audiod_get_socket(void) PARA_EMERG_LOG("can not listen on socket\n"); exit(EXIT_FAILURE); /* do not unlink socket */ } - mark_fd_nonblock(fd); + mark_fd_nonblocking(fd); return fd; } @@ -958,7 +951,7 @@ static void close_stat_pipe(void) return; client_close(stat_task->pcd); stat_task->pcd = NULL; - for (i = 0; i < NUM_STAT_ITEMS; i++) { + FOR_EACH_STATUS_ITEM(i) { free(stat_task->stat_item_values[i]); stat_task->stat_item_values[i] = NULL; } @@ -967,11 +960,11 @@ static void close_stat_pipe(void) stat_task->offset_seconds = 0; audiod_status_dump(); stat_task->playing = 0; - stat_task->stat_item_values[SI_STATUS_BAR] = make_message( - "%s:no connection to para_server\n", - status_item_list[SI_STATUS_BAR]); - stat_client_write(stat_task->stat_item_values[SI_STATUS_BAR], - SI_STATUS_BAR); + stat_task->stat_item_values[SI_BASENAME] = make_message( + "%s: no connection to para_server\n", + status_item_list[SI_BASENAME]); + stat_client_write(stat_task->stat_item_values[SI_BASENAME], + SI_BASENAME); if (stat_task->clock_diff_count) { stat_task->clock_diff_barrier.tv_sec = now->tv_sec + 1; stat_task->clock_diff_barrier.tv_usec = now->tv_usec; @@ -1068,7 +1061,7 @@ static void status_post_select(__a_unused struct sched *s, struct task *t) return; } bytes_left = for_each_line(st->pcd->buf, st->pcd->loaded, - &check_stat_line); + &check_stat_line, NULL); if (st->pcd->loaded != bytes_left) { st->last_status_read = *now; st->pcd->loaded = bytes_left; @@ -1120,7 +1113,7 @@ static void set_initial_status(void) * */ int main(int argc, char *argv[]) { - char *cf; + char *config_file; int ret, i; struct sched s; struct command_task command_task_struct, *cmd_task = &command_task_struct; @@ -1130,8 +1123,8 @@ int main(int argc, char *argv[]) audiod_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("audiod", conf); para_drop_privileges(conf.user_arg, conf.group_arg); - cf = configfile_exists(); - if (cf) { + config_file = configfile_exists(); + if (config_file) { struct audiod_cmdline_parser_params params = { .override = 0, .initialize = 0, @@ -1139,10 +1132,11 @@ int main(int argc, char *argv[]) .check_ambiguity = 0 }; - if (audiod_cmdline_parser_config_file(cf, &conf, ¶ms)) { + if (audiod_cmdline_parser_config_file(config_file, &conf, ¶ms)) { PARA_EMERG_LOG("%s", "parse error in config file\n"); exit(EXIT_FAILURE); } + free(config_file); } if (conf.logfile_given) logfile = open_log(conf.logfile_arg); @@ -1174,7 +1168,7 @@ int main(int argc, char *argv[]) register_task(audiod_task); s.default_timeout.tv_sec = 0; s.default_timeout.tv_usec = 99 * 1000; - ret = sched(&s); + ret = schedule(&s); PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret)); return EXIT_FAILURE;