From 321b12dd9aa9ba05626a3ac2ebe8643505916731 Mon Sep 17 00:00:00 2001 From: tonton th Date: Wed, 6 Jan 2021 11:47:55 +0100 Subject: [PATCH] cleanup --- Fonderie/fonderie.c | 23 ++++++++--------------- Fonderie/interpolator.c | 20 ++++++++++---------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/Fonderie/fonderie.c b/Fonderie/fonderie.c index 5bce53bd..8d0e8e80 100644 --- a/Fonderie/fonderie.c +++ b/Fonderie/fonderie.c @@ -82,13 +82,6 @@ if (1 != step) fprintf(stderr, "\tstep is %d\n", step); (void)fimg_timer_set(0); -#if 0 -if (infx) fprintf(stderr, "\tin fx #%d\n", infx); -else fprintf(stderr, "\tno in fx\n"); -if (outfx) fprintf(stderr, "\tout fx #%d\n", outfx); -else fprintf(stderr, "\tno out fx\n"); -#endif - memset(&globbuf, 0, sizeof(glob_t)); foo = glob(pattern, 0, NULL, &globbuf); if (foo) { @@ -191,8 +184,8 @@ int foo, opt; int fifosize = 10; char *in_pattern = "capture/?????.fimg"; char *out_dir = "p8"; -int in_effect = 0; -int out_effect = 0; +// OBSOLETE int in_effect = 0; +// OBSOLETE int out_effect = 0; int steps = 1; int blanks = 20; char *InFchain = "0"; @@ -223,10 +216,10 @@ while ((opt = getopt(argc, argv, "B:E:F:ghI:LO:s:T:vw:x:")) != -1) { break; case 'v': verbosity++; break; - case 'w': in_effect = atoi(optarg); - break; - case 'x': out_effect = atoi(optarg); - break; +// OBSOLETE case 'w': in_effect = atoi(optarg); +// OBSOLETE break; +// OBSOLETE case 'x': out_effect = atoi(optarg); +// OBSOLETE break; case 's': steps = atoi(optarg); break; } @@ -248,8 +241,8 @@ if (foo) { exit(1); } -foo = demarre_la_machine(in_pattern, out_dir, fifosize, in_effect, - out_effect, steps, blanks); +foo = demarre_la_machine(in_pattern, out_dir, fifosize, 0, + 0, steps, blanks); fprintf(stderr, "retour du big-run de la machine -> %d\n", foo); return 0; diff --git a/Fonderie/interpolator.c b/Fonderie/interpolator.c index 0cd98cf3..9f3ea883 100644 --- a/Fonderie/interpolator.c +++ b/Fonderie/interpolator.c @@ -71,8 +71,8 @@ for (idx=0; idxgl_pathv[idx]; foo = get_float_metric_from_file(filename, &metrique, method); if (foo) { - fprintf(stderr, "%s: err %d get metric of '%s'\n", __func__, - foo, filename); + fprintf(stderr, "%s: err %d get metric of '%s'\n", + __func__, foo, filename); return -1; } if (verbosity) @@ -119,7 +119,7 @@ int iarray[3]; char *cptr, line[200]; float coef, value; double meanmetric; -IdxValue *idx_values; +IdxValue *idx_values; /* gni? */ fprintf(stderr, " interpolate from '%s' to '%s' with %d steps.\n", pattern, outdir, Nsteps); @@ -237,8 +237,8 @@ puts("\t-S nn\t\tmysterious sort"); puts("\t-E i:bla:k\tinput filter chain"); puts("\t-F name:j\toutput filter chain"); puts("\t-L\t\tlist available filters"); -puts("\t-w nn\t\tinput effect"); -puts("\t-x nn\t\toutput effect"); +// OBSOLETE puts("\t-w nn\t\tinput effect"); +// OBSOLETE puts("\t-x nn\t\toutput effect"); puts("\t-v\t\tincrease verbosity"); if (verbosity) { @@ -253,8 +253,8 @@ int main (int argc, char *argv[]) int foo; int nbrsteps = 9; int opt; -int inFx = 0; -int outFx = 0; +// int inFx = 0; +// int outFx = 0; int sort = 0; char *InFchain = "0"; char *OutFchain = "0"; @@ -279,8 +279,8 @@ while ((opt = getopt(argc, argv, "E:F:hLS:vw:x:")) != -1) { exit(0); case 'S': sort = atoi(optarg); break; case 'v': verbosity++; break; - case 'w': inFx = atoi(optarg); break; - case 'x': outFx = atoi(optarg); break; +// OBSOLETE case 'w': inFx = atoi(optarg); break; +// OBSOLETE case 'x': outFx = atoi(optarg); break; } } @@ -313,7 +313,7 @@ if (verbosity > 1) { nbrsteps = atoi(argv[optind+2]); foo = interpolator(argv[optind], argv[optind+1], nbrsteps, - inFx, outFx, sort); + 0, 0, sort); fprintf(stderr, "interpolator give us a %d score\n", foo);