X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=afh.c;h=4c65d7c1f76bdc4b054461127d14b9547881d6f7;hb=1995ceed8d70a5b50dbf84ca4132a8c318afa51b;hp=84a061b9288f040a3b1a7d644565f17e8be90a97;hpb=80e46ec589d14be2fa4b0704f613a04ecb1b64c4;p=paraslash.git

diff --git a/afh.c b/afh.c
index 84a061b9..4c65d7c1 100644
--- a/afh.c
+++ b/afh.c
@@ -1,12 +1,12 @@
 /*
- * Copyright (C) 2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2008-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
-#include <dirent.h>
+#include <regex.h>
 
 #include "para.h"
 #include "string.h"
@@ -14,60 +14,96 @@
 #include "fd.h"
 #include "afh.h"
 #include "error.h"
+#include "version.h"
 
 static struct afh_args_info conf;
-/** The list of all status items */
-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)
+{
+	char *msg;
+
+	afh_get_afhi_txt(audio_format_num, afhi, &msg);
+	printf("%s", msg);
+	free(msg);
+}
+
+static void print_chunk_table(struct afh_info *afhi)
+{
+	int i;
+
+	if (conf.parser_friendly_given) {
+		printf("chunk_table: ");
+		for (i = 0; i <= afhi->chunks_total; i++)
+			printf("%u ", afhi->chunk_table[i]);
+		printf("\n");
+		return;
+	}
+	for (i = 1; i <= afhi->chunks_total; i++) {
+		struct timeval tv;
+		long unsigned from, to;
+		tv_scale(i - 1, &afhi->chunk_tv, &tv);
+		from = tv2ms(&tv);
+		tv_scale(i, &afhi->chunk_tv, &tv);
+		to = tv2ms(&tv);
+		printf("%d [%lu.%03lu - %lu.%03lu] %u - %u (%u)\n", i - 1,
+			from / 1000, from % 1000, to / 1000, to % 1000,
+			afhi->chunk_table[i - 1], afhi->chunk_table[i],
+			afhi->chunk_table[i] - afhi->chunk_table[i - 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 i, ret;
+	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)
-		goto out;
-	printf("%s: %dkbit/s\n" /* bitrate */
-		"%s: %s\n" /* format */
-		"%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 */
-		status_item_list[SI_BITRATE], afhi.bitrate,
-		status_item_list[SI_FORMAT], audio_format_name(ret),
-		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
-	);
-	ret = 1;
-	if (!conf.chunk_table_given)
-		goto out;
-	printf("chunk_table: ");
-	for (i = 0; i <= afhi.chunks_total; i++)
-		printf("%u ", afhi.chunk_table[i]);
-	printf("\n");
-	ret = 1;
+	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) {
+			PARA_ERROR_LOG("failed to mmap \"%s\"\n", conf.inputs[i]);
+			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;
+		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);
+		printf("\n");
+		clear_afhi(&afhi);
+		ret2 = para_munmap(audio_file_data, audio_file_size);
+		if (ret2 < 0 && ret >= 0)
+			ret = ret2;
+		if (ret < 0)
+			break;
+	}
 out:
 	if (ret < 0)
 		PARA_ERROR_LOG("%s\n", para_strerror(-ret));