From c216ac3049102422a41ba2c9476b0dbf4f3e4034 Mon Sep 17 00:00:00 2001
From: Mattias Andrée <maandree@kth.se>
Date: Sun, 16 Jul 2017 00:59:42 +0200
Subject: Use #include instead of #define
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Mattias Andrée <maandree@kth.se>
---
 src/blind-triangular-wave.c | 84 ++++++++++++++++++++++++---------------------
 1 file changed, 44 insertions(+), 40 deletions(-)

(limited to 'src/blind-triangular-wave.c')

diff --git a/src/blind-triangular-wave.c b/src/blind-triangular-wave.c
index 8e32d0f..b1baf53 100644
--- a/src/blind-triangular-wave.c
+++ b/src/blind-triangular-wave.c
@@ -1,4 +1,5 @@
 /* See LICENSE file for copyright and license details. */
+#ifndef TYPE
 #include "common.h"
 
 USAGE("[-es]")
@@ -6,46 +7,8 @@ USAGE("[-es]")
 static int equal = 0;
 static int spiral = 0;
 
-#define PROCESS(TYPE, SUFFIX)\
-	static void\
-	process_##SUFFIX(struct stream *stream)\
-	{\
-		size_t i, j, n;\
-		TYPE v, *p;\
-		do {\
-			if (equal) {\
-				n = stream->ptr / stream->pixel_size;\
-				for (i = 0; i < n; i++) {\
-					p = (TYPE *)(stream->buf) + i * stream->n_chan;\
-					v = posmod(*p, (TYPE)2);\
-					v = v > 1 ? 2 - v : v;\
-					if (spiral)\
-						v = (v > (TYPE)0.5 ? 1 - v : v) * 2;\
-					for (j = 0; j < stream->n_chan; j++)\
-						p[j] = v;\
-				}\
-				n *= stream->pixel_size;\
-			} else {\
-				n = stream->ptr / stream->chan_size;\
-				for (i = 0; i < n; i++) {\
-					p = (TYPE *)(stream->buf) + i;\
-					v = posmod(*p, (TYPE)2);\
-					v = v > 1 ? 2 - v : v;\
-					if (spiral)\
-						v = (v > (TYPE)0.5 ? 1 - v : v) * 2;\
-					*p = v;\
-				}\
-				n *= stream->chan_size;\
-			}\
-			ewriteall(STDOUT_FILENO, stream->buf, n, "<stdout>");\
-			memmove(stream->buf, stream->buf + n, stream->ptr -= n);\
-		} while (eread_stream(stream, SIZE_MAX));\
-		if (stream->ptr)\
-			eprintf("%s: incomplete frame\n", stream->file);\
-	}
-
-PROCESS(double, lf)
-PROCESS(float, f)
+#define FILE "blind-triangular-wave.c"
+#include "define-functions.h"
 
 int
 main(int argc, char *argv[])
@@ -81,3 +44,44 @@ main(int argc, char *argv[])
 	process(&stream);
 	return 0;
 }
+
+#else
+
+static void
+PROCESS(struct stream *stream)
+{
+	size_t i, j, n;
+	TYPE v, *p;
+	do {
+		if (equal) {
+			n = stream->ptr / stream->pixel_size;
+			for (i = 0; i < n; i++) {
+				p = (TYPE *)(stream->buf) + i * stream->n_chan;
+				v = posmod(*p, (TYPE)2);
+				v = v > 1 ? 2 - v : v;
+				if (spiral)
+					v = (v > (TYPE)0.5 ? 1 - v : v) * 2;
+				for (j = 0; j < stream->n_chan; j++)
+					p[j] = v;
+			}
+			n *= stream->pixel_size;
+		} else {
+			n = stream->ptr / stream->chan_size;
+			for (i = 0; i < n; i++) {
+				p = (TYPE *)(stream->buf) + i;
+				v = posmod(*p, (TYPE)2);
+				v = v > 1 ? 2 - v : v;
+				if (spiral)
+					v = (v > (TYPE)0.5 ? 1 - v : v) * 2;
+				*p = v;
+			}
+			n *= stream->chan_size;
+		}
+		ewriteall(STDOUT_FILENO, stream->buf, n, "<stdout>");
+		memmove(stream->buf, stream->buf + n, stream->ptr -= n);
+	} while (eread_stream(stream, SIZE_MAX));
+	if (stream->ptr)
+		eprintf("%s: incomplete frame\n", stream->file);
+}
+
+#endif
-- 
cgit v1.2.3-70-g09d2