X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=afh.c;h=66c4d1ca0f41a9c0b09ff2f70bc3ce566007bca8;hp=b5fb65fc418a6e4a3febef87cdce6d630b81cfb3;hb=656a02453498156bab09763011ff43b81db57634;hpb=ca804c3cdb7a9673c9d8d166a3646c2bc295bb11

diff --git a/afh.c b/afh.c
index b5fb65fc..66c4d1ca 100644
--- a/afh.c
+++ b/afh.c
@@ -7,7 +7,6 @@
 /** \file afh.c Paraslash's standalone audio format handler tool. */
 
 #include <regex.h>
-#include <dirent.h>
 #include <sys/time.h>
 
 #include "para.h"
@@ -16,6 +15,7 @@
 #include "fd.h"
 #include "afh.h"
 #include "error.h"
+#include "version.h"
 
 static struct afh_args_info conf;
 /** The list of all status items */
@@ -83,15 +83,16 @@ static void print_chunk_table(struct afh_info *afhi)
 	}
 }
 
-static int cat_file(void *audio_file_data, struct afh_info *afhi)
+static int cat_file(struct afh_info *afhi, int audio_format_id,
+		void *audio_file_data, size_t audio_file_size)
 {
 	int ret;
 	struct timeval stream_start;
 	long unsigned i, first_chunk, last_chunk;
 	const char *buf;
+	char *header;
 	size_t size;
 
-
 	if (conf.begin_chunk_arg < 0) {
 		if (-conf.begin_chunk_arg > afhi->chunks_total)
 			return -ERRNO_TO_PARA_ERROR(EINVAL);
@@ -114,14 +115,18 @@ static int cat_file(void *audio_file_data, struct afh_info *afhi)
 		return -ERRNO_TO_PARA_ERROR(EINVAL);
 	if (!afhi->chunks_total)
 		return 1;
-	afh_get_header(afhi, audio_file_data, &buf, &size);
-	if (size && first_chunk && !conf.no_header_given) {
-		PARA_INFO_LOG("writing audio file header (%zu bytes)\n", size);
-		ret = write(STDOUT_FILENO, buf, size);
-		if (ret < 0)
-			return ret;
-		if (ret != size)
-			return -E_AFH_SHORT_WRITE;
+	if (first_chunk > 0 && !conf.no_header_given) {
+		afh_get_header(afhi, audio_format_id, audio_file_data, audio_file_size,
+			&header, &size);
+		if (size > 0) {
+			PARA_INFO_LOG("writing header (%zu bytes)\n", size);
+			ret = write(STDOUT_FILENO, header, size); /* FIXME */
+			afh_free_header(header, audio_format_id);
+			if (ret < 0)
+				return ret;
+			if (ret != size)
+				return -E_AFH_SHORT_WRITE;
+		}
 	}
 	PARA_NOTICE_LOG("writing chunks %lu - %lu\n", first_chunk, last_chunk);
 	gettimeofday(&stream_start, NULL);
@@ -184,9 +189,11 @@ int main(int argc, char **argv)
 			fd, &afhi);
 		if (ret < 0)
 			goto out;
+
 		audio_format_num = ret;
 		if (conf.stream_given)
-			ret = cat_file(audio_file_data, &afhi);
+			ret = cat_file(&afhi, audio_format_num,
+				audio_file_data, audio_file_size);
 		else {
 			printf("File %d: %s\n", i + 1, conf.inputs[i]);
 			print_info(audio_format_num, &afhi);