X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=c00644939d1bdd04f5010729715af874725f4a86;hp=86f34ace67e0efcba11fb9ddfe1a2f23ca2416b7;hb=57e0c93e87138fdf1c8793c3d1f3d2880d717548;hpb=087145d473a3956443e3ea50c48f5a104d43df5d diff --git a/afh.c b/afh.c index 86f34ace..c0064493 100644 --- a/afh.c +++ b/afh.c @@ -1,11 +1,12 @@ /* - * Copyright (C) 2008 Andre Noll + * Copyright (C) 2008-2009 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ /** \file afh.c Paraslash's standalone audio format handler tool. */ +#include #include #include @@ -21,7 +22,9 @@ static struct afh_args_info conf; const char *status_item_list[] = {STATUS_ITEM_ARRAY}; INIT_AFH_ERRLISTS; -INIT_STDERR_LOGGING(conf.loglevel_arg) + +static int loglevel; +INIT_STDERR_LOGGING(loglevel) static void print_info(int audio_format_num, struct afh_info *afhi) { @@ -30,18 +33,28 @@ static void print_info(int audio_format_num, struct afh_info *afhi) "%s: %dHz\n" /* frequency */ "%s: %d\n" /* channels */ "%s: %lu\n" /* seconds total */ - "%s" /* tag info */ "%s: %lu: %lu\n" /* chunk time */ - "%s: %lu\n", /* num chunks */ + "%s: %lu\n" /* num chunks */ + "%s: %s\n" /* techinfo */ + "%s: %s\n" /* artist */ + "%s: %s\n" /* title */ + "%s: %s\n" /* year */ + "%s: %s\n" /* album */ + "%s: %s\n", /* comment */ status_item_list[SI_BITRATE], afhi->bitrate, status_item_list[SI_FORMAT], audio_format_name(audio_format_num), status_item_list[SI_FREQUENCY], afhi->frequency, status_item_list[SI_CHANNELS], afhi->channels, status_item_list[SI_SECONDS_TOTAL], afhi->seconds_total, - afhi->info_string, status_item_list[SI_CHUNK_TIME], (long unsigned)afhi->chunk_tv.tv_sec, (long unsigned)afhi->chunk_tv.tv_usec, - status_item_list[SI_NUM_CHUNKS], afhi->chunks_total + status_item_list[SI_NUM_CHUNKS], afhi->chunks_total, + status_item_list[SI_TECHINFO], afhi->techinfo? afhi->techinfo : "", + status_item_list[SI_ARTIST], afhi->tags.artist? afhi->tags.artist : "", + status_item_list[SI_TITLE], afhi->tags.title? afhi->tags.title : "", + status_item_list[SI_YEAR], afhi->tags.year? afhi->tags.year : "", + status_item_list[SI_ALBUM], afhi->tags.album? afhi->tags.album : "", + status_item_list[SI_COMMENT], afhi->tags.comment? afhi->tags.comment : "" ); } @@ -60,22 +73,30 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi) int ret; struct timeval stream_start; long unsigned i, first_chunk, last_chunk; - char *buf; + const char *buf; size_t size; - if (conf.begin_chunk_arg < 0) - return -ERRNO_TO_PARA_ERROR(EINVAL); - first_chunk = conf.begin_chunk_arg; - - if (conf.end_chunk_given) { - if (conf.end_chunk_arg < 0) - return -ERRNO_TO_PARA_ERROR(EINVAL); - if (conf.end_chunk_arg >= afhi->chunks_total) + if (conf.begin_chunk_arg < 0) { + if (-conf.begin_chunk_arg > afhi->chunks_total) return -ERRNO_TO_PARA_ERROR(EINVAL); - last_chunk = conf.end_chunk_arg; + first_chunk = afhi->chunks_total + conf.begin_chunk_arg; + } else + first_chunk = conf.begin_chunk_arg; + if (conf.end_chunk_given) { + if (conf.end_chunk_arg < 0) { + if (-conf.end_chunk_arg > afhi->chunks_total) + return -ERRNO_TO_PARA_ERROR(EINVAL); + last_chunk = afhi->chunks_total + conf.end_chunk_arg; + } else { + if (conf.end_chunk_arg >= afhi->chunks_total) + return -ERRNO_TO_PARA_ERROR(EINVAL); + last_chunk = conf.end_chunk_arg; + } } else last_chunk = afhi->chunks_total - 1; + if (first_chunk >= last_chunk) + return -ERRNO_TO_PARA_ERROR(EINVAL); if (!afhi->chunks_total) return 1; afh_get_header(afhi, audio_file_data, &buf, &size); @@ -104,6 +125,8 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi) return ret; } } + if (!size) + continue; PARA_INFO_LOG("writing chunk %lu\n", i); ret = write_all(STDOUT_FILENO, buf, &size); if (ret < 0) @@ -112,34 +135,62 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi) return 1; } +/** + * The main function of para_afh. + * + * \param argc Usual argument count. + * \param argv Usual argument vector. + * + * \return \p EXIT_FAILURE or \p EXIT_SUCCESS. + */ int main(int argc, char **argv) { - int ret, audio_format_num; + int i, ret, audio_format_num, fd; void *audio_file_data; size_t audio_file_size; struct afh_info afhi; afh_cmdline_parser(argc, argv, &conf); HANDLE_VERSION_FLAG("afh", conf); + loglevel = get_loglevel_by_name(conf.loglevel_arg); ret = -E_AFH_SYNTAX; - if (conf.inputs_num != 1) + if (conf.inputs_num == 0) goto out; - afh_init(); - ret = mmap_full_file(conf.inputs[0], O_RDONLY, &audio_file_data, - &audio_file_size, NULL); - if (ret < 0) - goto out; - ret = compute_afhi(conf.inputs[0], audio_file_data, audio_file_size, &afhi); - if (ret < 0) + if (conf.stream_given && conf.inputs_num != 1) goto out; - audio_format_num = ret; - if (conf.stream_given) - ret = cat_file(audio_file_data, &afhi); - else { - print_info(audio_format_num, &afhi); - if (conf.chunk_table_given) - print_chunk_table(&afhi); - ret = 1; + afh_init(); + for (i = 0; i < conf.inputs_num; i++) { + int ret2; + ret = mmap_full_file(conf.inputs[i], O_RDONLY, &audio_file_data, + &audio_file_size, &fd); + if (ret < 0) + goto out; + ret = compute_afhi(conf.inputs[i], audio_file_data, audio_file_size, + fd, &afhi); + if (ret < 0) + goto out; + audio_format_num = ret; + if (conf.stream_given) + ret = cat_file(audio_file_data, &afhi); + else { + printf("File %d: %s\n", i + 1, conf.inputs[i]); + print_info(audio_format_num, &afhi); + if (conf.chunk_table_given) + print_chunk_table(&afhi); + free(afhi.techinfo); + free(afhi.tags.artist); + free(afhi.tags.title); + free(afhi.tags.year); + free(afhi.tags.album); + free(afhi.tags.comment); + free(afhi.chunk_table); + printf("\n"); + } + ret2 = para_munmap(audio_file_data, audio_file_size); + if (ret2 < 0 && ret >= 0) + ret = ret2; + if (ret < 0) + break; } out: if (ret < 0)