From ce6d6e58bba3a63ef8f7d420fc0cc4cd196603c2 Mon Sep 17 00:00:00 2001
From: tth <tth@fubar.tetalab.org>
Date: Sat, 24 Apr 2021 00:16:23 +0200
Subject: [PATCH] seekin the holy gral of pipedeprod

---
 Fonderie/fonderie.c   | 12 ++++--------
 Fonderie/metriques.c  |  4 ++++
 Fonderie/singlepass.c |  5 +++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Fonderie/fonderie.c b/Fonderie/fonderie.c
index 9eaa639..a26b93f 100644
--- a/Fonderie/fonderie.c
+++ b/Fonderie/fonderie.c
@@ -77,7 +77,7 @@ return 0;
 /* -------------------------------------------------------------- */
 
 int demarre_la_machine(char *pattern, char *outdir, int szfifo,
-					int step, int blk)
+					int outfmt, int blk)
 {
 int			foo, idx, width, height;
 glob_t			globbuf;
@@ -92,8 +92,6 @@ fprintf(stderr, "\n>>> %s ( '%s' -> '%s'  %d )\n", __func__,
 			pattern, outdir, szfifo);
 #endif
 
-if (1 != step) fprintf(stderr, "\tstep is %d\n", step);
-
 (void)fimg_timer_set(0);
 
 memset(&globbuf, 0, sizeof(glob_t));
@@ -197,7 +195,7 @@ int		foo, opt;
 int		fifosize = 10;
 char		*in_pattern = "capture/?????.fimg";
 char		*out_dir = "p8";
-int		steps = 1;
+int		outfmt = FILE_TYPE_PNG;
 int		blanks = 20;
 char		*InFchain  = "none";
 char		*OutFchain = "none";
@@ -206,7 +204,7 @@ fprintf(stderr, "*** %s\n\tcompiled %s, %s, pid %d\n",
 			argv[0], __DATE__, __TIME__, getpid());
 fimg_print_version(2);
 
-while ((opt = getopt(argc, argv, "B:E:F:ghI:LO:s:T:vw:x:")) != -1) {
+while ((opt = getopt(argc, argv, "B:E:F:ghI:LO:T:vw:x:")) != -1) {
 	switch(opt) {
 		case 'E':	InFchain = optarg;		break;
 		case 'F':	OutFchain = optarg;		break;
@@ -227,8 +225,6 @@ while ((opt = getopt(argc, argv, "B:E:F:ghI:LO:s:T:vw:x:")) != -1) {
 				break;
 		case 'v':	verbosity++;
 				break;
-		case 's':	steps = atoi(optarg);
-				break;
 		}
 	}
 
@@ -256,7 +252,7 @@ if (verbosity) {
 	fprintf(stderr, ".\n");
 	}
 
-foo = demarre_la_machine(in_pattern, out_dir, fifosize, steps, blanks);
+foo = demarre_la_machine(in_pattern, out_dir, fifosize, outfmt, blanks);
 
 fprintf(stderr, "retour du big-run de la machine -> %d\n", foo);
 
diff --git a/Fonderie/metriques.c b/Fonderie/metriques.c
index 83060a0..697f774 100644
--- a/Fonderie/metriques.c
+++ b/Fonderie/metriques.c
@@ -85,6 +85,10 @@ FloatImg	image;
 int		foo;
 float		fval;
 
+#if DEBUG_LEVEL
+fprintf(stderr, ">>> %s ( '%s' %p %d )\n", __func__, fname, where, mode);
+#endif
+
 foo = fimg_create_from_dump(fname, &image);
 if (foo) {
 	fprintf(stderr, "%s: err %d loading %s\n", __func__, foo, fname);
diff --git a/Fonderie/singlepass.c b/Fonderie/singlepass.c
index eb0be50..7c64b8f 100644
--- a/Fonderie/singlepass.c
+++ b/Fonderie/singlepass.c
@@ -142,7 +142,7 @@ int		foo, opt;
 char		*filterchain =   "none";
 char		*globbing    =   "./capture/?????.fimg";
 char		*outdir      =   "./p8";
-char		*outtype     =   ".png";
+// char		*outtype     =   ".png";
 int		do_xper = 0;
 
 fprintf(stderr, "*** %s : compiled %s %s\n", __FILE__,
@@ -189,10 +189,11 @@ if (verbosity) {
 	fprintf(stderr, "\tinput glob        %s\n", globbing);
 	fprintf(stderr, "\tfilter chain      %s\n", filterchain);
 	fprintf(stderr, "\toutput dir        %s\n", outdir);
+	// fprintf(stderr, "\toutput type       %s\n", outtype);
 	fprintf(stderr, "\tdo xper           %d\n", do_xper);
 	}
 
-foo = run_the_singlepass(globbing, outdir, FILTERS, -1);
+foo = run_the_singlepass(globbing, outdir, FILTERS, FILE_TYPE_PNG);
 fprintf(stderr, "\n\tRun the single pass --> %d\n", foo);
 
 return 0;