From: Andre Noll Date: Thu, 23 Jun 2011 17:13:40 +0000 (+0200) Subject: Merge branch 't/alsa_drain_fix' X-Git-Tag: v0.4.8~29 X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=74f1e057c1579d880becb6a32acd43641b1a8c2b;hp=8a5b6bf798581bdf49e39084f456bce07c01b498 Merge branch 't/alsa_drain_fix' --- diff --git a/NEWS b/NEWS index da1398db..57ef197b 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,11 @@ 0.4.8 (to be announced) "nested assignment" ------------------------------------------- + - audiod: The format specifier for receivers, filters and + writers is now treated as a regular expression. This allows + to replace 5 lines in the config file (one for each audio + format) by one single line. See the manual for details. + -------------------------------------- 0.4.7 (2011-06-01) "infinite rollback" -------------------------------------- diff --git a/aft.c b/aft.c index be4d572e..a27e67ee 100644 --- a/aft.c +++ b/aft.c @@ -18,7 +18,6 @@ #include "string.h" #include "afh.h" #include "afs.h" -#include "net.h" #include "fd.h" #include "ipc.h" #include "portable_io.h" @@ -2569,10 +2568,6 @@ static void aft_close(void) { osl_close_table(audio_file_table, OSL_MARK_CLEAN); audio_file_table = NULL; - free(status_items); - status_items = NULL; - free(parser_friendly_status_items); - parser_friendly_status_items = NULL; } /** diff --git a/attribute.c b/attribute.c index 4c664996..42fa421c 100644 --- a/attribute.c +++ b/attribute.c @@ -15,7 +15,6 @@ #include "string.h" #include "afh.h" #include "afs.h" -#include "net.h" #include "ipc.h" static struct osl_table *attribute_table; diff --git a/audiod.c b/audiod.c index 6a4c9dbe..03218e24 100644 --- a/audiod.c +++ b/audiod.c @@ -178,6 +178,22 @@ static int get_audio_format_num(const char *name) return -E_UNSUPPORTED_AUDIO_FORMAT; } +static int get_matching_audio_format_nums(const char *re) +{ + int i, ret; + regex_t preg; + + ret = para_regcomp(&preg, re, REG_EXTENDED | REG_NOSUB); + if (ret < 0) + return ret; + ret = 0; + FOR_EACH_AUDIO_FORMAT(i) + if (regexec(&preg, audio_formats[i], 0, NULL, 0) != REG_NOMATCH) + ret |= (1 << i); + regfree(&preg); + return ret; +} + /** * Compute the play time based on information of the given slot. * @@ -716,30 +732,36 @@ static int update_item(int itemnum, char *buf) static int parse_stream_command(const char *txt, char **cmd) { - char *p = strchr(txt, ':'); - int i; + int ret, len; + char *re, *p = strchr(txt, ':'); if (!p) return -E_MISSING_COLON; - p++; - FOR_EACH_AUDIO_FORMAT(i) { - if (strncmp(txt, audio_formats[i], strlen(audio_formats[i]))) - continue; - *cmd = p; - return i; - } - return -E_UNSUPPORTED_AUDIO_FORMAT; + *cmd = p + 1; + len = p - txt; + re = malloc(len + 1); + strncpy(re, txt, len); + re[len] = '\0'; + ret = get_matching_audio_format_nums(re); + free(re); + return ret; } static int add_filter(int format, char *cmdline) { struct audio_format_info *a = &afi[format]; int filter_num, nf = a->num_filters; + void *cfg; - filter_num = check_filter_arg(cmdline, &a->filter_conf[nf]); + filter_num = check_filter_arg(cmdline, &cfg); if (filter_num < 0) return filter_num; + a->filter_conf = para_realloc(a->filter_conf, + (nf + 1) * sizeof(void *)); + a->filter_nums = para_realloc(a->filter_nums, + (nf + 1) * sizeof(unsigned)); a->filter_nums[nf] = filter_num; + a->filter_conf[nf] = cfg; a->num_filters++; PARA_INFO_LOG("%s filter %d: %s\n", audio_formats[format], nf, filters[filter_num].name); @@ -748,36 +770,35 @@ static int add_filter(int format, char *cmdline) static int parse_writer_args(void) { - int i, ret, nw; + int i, ret; char *cmd; struct audio_format_info *a; - nw = PARA_MAX(1U, conf.writer_given); - PARA_INFO_LOG("maximal number of writers: %d\n", nw); - FOR_EACH_AUDIO_FORMAT(i) { - a = &afi[i]; - a->writer_conf = para_malloc(nw * sizeof(void *)); - a->writer_nums = para_malloc(nw * sizeof(int)); - a->num_writers = 0; - } for (i = 0; i < conf.writer_given; i++) { void *wconf; - int writer_num; + int j, nw, writer_num, af_mask; + ret = parse_stream_command(conf.writer_arg[i], &cmd); if (ret < 0) goto out; - a = &afi[ret]; - nw = a->num_writers; - wconf = check_writer_arg(cmd, &writer_num); - if (!wconf) { - ret = writer_num; - goto out; + af_mask = ret; + FOR_EACH_AUDIO_FORMAT(j) { + a = afi + j; + if ((af_mask & (1 << j)) == 0) /* no match */ + continue; + ret = -E_WRITE_COMMON_SYNTAX; + wconf = check_writer_arg(cmd, &writer_num); + if (!wconf) + goto out; + nw = a->num_writers; + a->writer_nums = para_realloc(a->writer_nums, (nw + 1) * sizeof(int)); + a->writer_conf = para_realloc(a->writer_conf, (nw + 1) * sizeof(void *)); + a->writer_nums[nw] = writer_num; + a->writer_conf[nw] = wconf; + PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[writer_num], + nw, writer_names[writer_num]); + a->num_writers++; } - a->writer_nums[nw] = writer_num; - a->writer_conf[nw] = wconf; - PARA_INFO_LOG("%s writer #%d: %s\n", audio_formats[ret], - nw, writer_names[writer_num]); - a->num_writers++; } ret = 1; out: @@ -791,30 +812,31 @@ static int parse_receiver_args(void) struct audio_format_info *a; for (i = conf.receiver_given - 1; i >= 0; i--) { - char *arg = conf.receiver_arg[i]; - char *recv_arg = strchr(arg, ':'); - ret = -E_MISSING_COLON; - if (!recv_arg) - goto out; - *recv_arg = '\0'; - recv_arg++; - ret = get_audio_format_num(arg); + char *arg; + int j, af_mask; + + ret = parse_stream_command(conf.receiver_arg[i], &arg); if (ret < 0) goto out; - /* - * If multiple receivers are given for this audio format, the - * last one wins and we have to free the previous receiver - * config here. Since we are iterating backwards, the winning - * receiver arg is in fact the first one given. - */ - if (afi[ret].receiver_conf) - afi[ret].receiver->free_config(afi[ret].receiver_conf); - afi[ret].receiver_conf = check_receiver_arg(recv_arg, &receiver_num); - if (!afi[ret].receiver_conf) { + af_mask = ret; + FOR_EACH_AUDIO_FORMAT(j) { + a = afi + j; + if ((af_mask & (1 << j)) == 0) /* no match */ + continue; + /* + * If multiple receivers are given for this audio format, the + * last one wins and we have to free the previous receiver + * config here. Since we are iterating backwards, the winning + * receiver arg is in fact the first one given. + */ + if (a->receiver_conf) + a->receiver->free_config(a->receiver_conf); + a->receiver_conf = check_receiver_arg(arg, &receiver_num); ret = -E_RECV_SYNTAX; - goto out; + if (!a->receiver_conf) + goto out; + a->receiver = receivers + receiver_num; } - afi[ret].receiver = &receivers[receiver_num]; } /* * Use the first available receiver with no arguments for those audio @@ -830,6 +852,11 @@ static int parse_receiver_args(void) return -E_RECV_SYNTAX; a->receiver = &receivers[receiver_num]; } + FOR_EACH_AUDIO_FORMAT(i) { + a = afi + i; + PARA_INFO_LOG("receiving %s streams via %s receiver\n", + audio_formats[i], a->receiver->name); + } ret = 1; out: free(cmd); @@ -848,8 +875,8 @@ static int init_default_filters(void) if (a->num_filters) continue; /* no default -- nothing to to */ /* - * If udp is used to receive this audiod format, add fecdec as - * the first filter. + * udp and dccp streams are fec-encoded, so add fecdec as the + * first filter. */ if (strcmp(afi[i].receiver->name, "udp") == 0 || strcmp(afi[i].receiver->name, "dccp") == 0) { @@ -882,30 +909,23 @@ out: static int parse_filter_args(void) { - int i, ret, nf; + int i, j, ret, af_mask; - nf = PARA_MAX(2U, conf.filter_given); - PARA_INFO_LOG("maximal number of filters: %d\n", nf); - FOR_EACH_AUDIO_FORMAT(i) { - afi[i].filter_conf = para_malloc(nf * sizeof(void *)); - afi[i].filter_nums = para_malloc(nf * sizeof(unsigned)); - } if (!conf.no_default_filters_given) return init_default_filters(); for (i = 0; i < conf.filter_given; i++) { - char *arg = conf.filter_arg[i]; - char *filter_name = strchr(arg, ':'); - ret = -E_MISSING_COLON; - if (!filter_name) - goto out; - *filter_name = '\0'; - filter_name++; - ret = get_audio_format_num(arg); - if (ret < 0) - goto out; - ret = add_filter(ret, filter_name); + char *arg; + ret = parse_stream_command(conf.filter_arg[i], &arg); if (ret < 0) goto out; + af_mask = ret; + FOR_EACH_AUDIO_FORMAT(j) { + if ((af_mask & (1 << j)) == 0) /* no match */ + continue; + ret = add_filter(j, arg); + if (ret < 0) + goto out; + } } ret = init_default_filters(); /* use default values for the rest */ out: diff --git a/blob.c b/blob.c index dfe4e374..25aa2a6d 100644 --- a/blob.c +++ b/blob.c @@ -16,7 +16,6 @@ #include "string.h" #include "afh.h" #include "afs.h" -#include "net.h" #include "ipc.h" #include "portable_io.h" diff --git a/ggo/audiod.m4 b/ggo/audiod.m4 index 1b500854..628188d5 100644 --- a/ggo/audiod.m4 +++ b/ggo/audiod.m4 @@ -120,16 +120,26 @@ default="http" optional multiple details=" - This option may be given multiple times, once for each - supported audio format. The \"receiver_spec\" consists of - an audio format and the receiver name, separated by a colon, - and any options for that receiver, seperated by whitespace. - If any receiver options are present, the whole receiver - argument must be quoted. + This option may be given multiple times, for each audio format + separately. If multiple definitions for an audio format are + given, the first one is selected. + + The \"receiver_spec\" consists of an audio format specifier + and one or more receiver arguments, separated by a colon. - Example: + The audio format specifier is a regular expression which + specifies the set of audio formats for which this option + should apply. + + If any receiver options are present, the whole receiver + argument must be quoted: -r 'mp3:http -i my.host.org -p 8009' + + Since a single dot '.' matches the name of any audio format, + specifying '.' instead of 'mp3' above activates the http + receiver for all audio formats. + " option "no_default_filters" D @@ -164,14 +174,17 @@ multiple dependon="no_default_filters" details=" This option may be given multiple times. The \"filter_spec\" - consists of an audio format, the name of the filter, and any - options for that filter. Note that order matters. + consists of an audio format specifier (see above), the name + of the filter, and any options for that filter. Note that + order matters. Examples: --filter 'mp3:mp3dec' - --filter 'mp3:compress --inertia 5 --damp 2' + --filter 'mp3|aac:compress --inertia 5 --damp 2' + + --filter '.:fecdec' " @@ -186,7 +199,7 @@ details=" audio format. Default value is \"alsa\" for all supported audio formats. Example: - --writer 'aac:osx' + --writer 'aac|wma:oss' " diff --git a/mood.c b/mood.c index d82d5a52..93461ee8 100644 --- a/mood.c +++ b/mood.c @@ -904,6 +904,8 @@ static int reload_current_mood(void) int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb, void *data) { + int ret; + if (!current_mood) return 0; switch (event) { @@ -916,6 +918,10 @@ int moods_event_handler(enum afs_events event, __a_unused struct para_buffer *pb case BLOB_ADD: if (data == moods_table || data == playlists_table) return 1; /* no reload necessary for these */ + ret = clear_score_table(); + if (ret < 0) + PARA_CRIT_LOG("clear score table returned %s\n", + para_strerror(-ret)); return reload_current_mood(); /* these also require reload of the score table */ case ATTRIBUTE_ADD: diff --git a/net.c b/net.c index ffd4350b..2f720b10 100644 --- a/net.c +++ b/net.c @@ -285,7 +285,7 @@ struct flowopts *flowopt_new(void) * \sa setsockopt(2) */ void flowopt_add(struct flowopts *fo, int lev, int opt, - char *name, const void *val, int len) + const char *name, const void *val, int len) { struct pre_conn_opt *new = para_malloc(sizeof(*new)); @@ -306,7 +306,7 @@ void flowopt_add(struct flowopts *fo, int lev, int opt, } void flowopt_add_bool(struct flowopts *fo, int lev, int opt, - char *optname, bool on_or_off) + const char *optname, bool on_or_off) { int on = on_or_off; /* kernel takes 'int' */ @@ -594,37 +594,6 @@ int generic_max_transport_msg_size(int sockfd) return generic_mtu(af_type) - estimated_header_overhead(af_type); } -/** - * Print numeric host and port number (beware - uses static char). - * - * \param sa The IPv4/IPv6 socket address to use. - * - * \return Host string in numeric host:port format, \sa parse_url(). - * \sa getnameinfo(3), services(5), nsswitch.conf(5) - */ -static char *host_and_port(const struct sockaddr_storage *ss) -{ - const struct sockaddr *sa = normalize_ip_address(ss); - char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; - static char output[sizeof(hbuf) + sizeof(sbuf) + 4]; - int ret; - - ret = getnameinfo(sa, salen(sa), - hbuf, sizeof(hbuf), - sbuf, sizeof(sbuf), - NI_NUMERICHOST | NI_NUMERICSERV); - if (ret) { - snprintf(output, sizeof(output), "(unknown)"); - PARA_WARNING_LOG("hostname lookup error (%s).\n", - gai_strerror(ret)); - } else if (sa->sa_family == AF_INET6) { - snprintf(output, sizeof(output), "[%s]:%s", hbuf, sbuf); - } else { - snprintf(output, sizeof(output), "%s:%s", hbuf, sbuf); - } - return output; -} - /** * Look up the local or remote side of a connected socket structure. * @@ -633,23 +602,39 @@ static char *host_and_port(const struct sockaddr_storage *ss) * remote side. * * \return A static character string identifying hostname and port of the - * chosen side. + * chosen side in numeric host:port format. * - * \sa getsockname(2), getpeername(2). + * \sa getsockname(2), getpeername(2), parse_url(), getnameinfo(3), + * services(5), nsswitch.conf(5). */ static char *__get_sock_name(int fd, int (*getname)(int, struct sockaddr*, socklen_t *)) { struct sockaddr_storage ss; + const struct sockaddr *sa; socklen_t sslen = sizeof(ss); + char hbuf[NI_MAXHOST], sbuf[NI_MAXSERV]; + static char output[sizeof(hbuf) + sizeof(sbuf) + 4]; + int ret; if (getname(fd, (struct sockaddr *)&ss, &sslen) < 0) { - static char *dont_know = "(don't know)"; PARA_ERROR_LOG("can not determine address from fd %d: %s\n", fd, strerror(errno)); - return dont_know; + snprintf(output, sizeof(output), "(unknown)"); + return output; } - return host_and_port(&ss); + sa = normalize_ip_address(&ss); + ret = getnameinfo(sa, salen(sa), hbuf, sizeof(hbuf), sbuf, + sizeof(sbuf), NI_NUMERICHOST | NI_NUMERICSERV); + if (ret) { + PARA_WARNING_LOG("hostname lookup error (%s).\n", + gai_strerror(ret)); + snprintf(output, sizeof(output), "(lookup error)"); + } else if (sa->sa_family == AF_INET6) + snprintf(output, sizeof(output), "[%s]:%s", hbuf, sbuf); + else + snprintf(output, sizeof(output), "%s:%s", hbuf, sbuf); + return output; } /** diff --git a/net.h b/net.h index a1af08ae..80f57944 100644 --- a/net.h +++ b/net.h @@ -60,9 +60,9 @@ struct flowopts; extern struct flowopts *flowopt_new(void); extern void flowopt_add(struct flowopts *fo, int level, int opt, - char *name, const void *val, int len); + const char *name, const void *val, int len); extern void flowopt_add_bool(struct flowopts *fo, int lev, int opt, - char *optname, bool on_or_off); + const char *optname, bool on_or_off); /** Flowopt shortcut macros */ #define OPT_ADD(fo, lev, opt, val, len) flowopt_add(fo, lev, opt, #opt, val, len) #define OPT_ENABLE(fo, lev, opt) flowopt_add_bool(fo, lev, opt, #opt, 1) diff --git a/web/manual.m4 b/web/manual.m4 index 46a2cd62..2af59f53 100644 --- a/web/manual.m4 +++ b/web/manual.m4 @@ -415,9 +415,9 @@ as bar@client_host We will also have to tell para_audiod that it should receive the -audio stream from server_host: +audio stream from server_host via http: - para_audiod -l info -r 'mp3:http -i server_host' + para_audiod -l info -r '.:http -i server_host' You should now be able to listen to the audio stream once para_server starts streaming. To activate streaming, execute @@ -1431,8 +1431,7 @@ from being interpreted by para_recv. -> Create a minimal config for para_audiod for HTTP streams: c=$HOME/.paraslash/audiod.conf.min; s=server.foo.com - formats="mp3 ogg aac wma" # remove what you do not have - for f in $formats; do echo receiver \"$f:http -i $s\"; done > $c + echo receiver \".:http -i $s\" > $c para_audiod --config $c ------- @@ -1470,11 +1469,23 @@ the driving application (para_audiod or para_filter). Example: para_filter -f 'mp3dec --ignore-crc' -f 'compress --damp 1' For para_audiod, each audio format has its own set of filters. The -name of the audio format for which the filter should be applied is -used as the prefix for the filter option. Example: +name of the audio format for which the filter should be applied can +be used as the prefix for the filter option. Example: para_audiod -f 'mp3:prebuffer --duration 300' +The "mp3" prefix above is actually interpreted as a POSIX extended +regular expression. Therefore + + para_audiod -f '.:prebuffer --duration 300' + +activates the prebuffer filter for all supported audio formats (because +"." matches all audio formats) while + + para_audiod -f 'wma|ogg:prebuffer --duration 300' + +activates it only for wma and ogg streams. + Decoders ~~~~~~~~