From f91e6f503464e485fa2cee93d52f08c0df0b2d2b Mon Sep 17 00:00:00 2001
From: Andreas Eversberg <jolly@eversberg.eu>
Date: Thu, 15 Feb 2018 07:27:49 +0100
Subject: [PATCH] Make libdebug not depend on libdisplay

---
 src/libdebug/debug.c          | 19 +++++++++++++++++++
 src/libdebug/debug.h          |  2 ++
 src/libdisplay/display.h      |  2 --
 src/libdisplay/display_wave.c | 18 ------------------
 src/test/test_emphasis.c      |  2 --
 src/test/test_filter.c        |  1 -
 6 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/libdebug/debug.c b/src/libdebug/debug.c
index d89473b..36b4438 100644
--- a/src/libdebug/debug.c
+++ b/src/libdebug/debug.c
@@ -24,6 +24,7 @@
 #include <stdint.h>
 #include <errno.h>
 #include <math.h>
+#include <sys/ioctl.h>
 #include "../libsample/sample.h"
 #include "debug.h"
 #include "../libdisplay/display.h"
@@ -72,6 +73,24 @@ void (*print_console_text)(void) = NULL;
 
 int debug_limit_scroll = 0;
 
+void get_win_size(int *w, int *h)
+{
+	struct winsize win;
+	int rc;
+
+	rc = ioctl(0, TIOCGWINSZ, &win);
+	if (rc) {
+		*w = 80;
+		*h = 25;
+		return;
+	}
+
+	*h = win.ws_row;
+	*w = win.ws_col;
+	if (*w > MAX_DISPLAY_WIDTH - 1)
+		*w = MAX_DISPLAY_WIDTH - 1;
+}
+
 void _printdebug(const char *file, const char __attribute__((unused)) *function, int line, int cat, int level, int chan, const char *fmt, ...)
 {
 	char buffer[4096], *b = buffer;
diff --git a/src/libdebug/debug.h b/src/libdebug/debug.h
index 6e9649d..734ad78 100644
--- a/src/libdebug/debug.h
+++ b/src/libdebug/debug.h
@@ -25,6 +25,8 @@
 #define DUHD		18
 #define DSOAPY		19
 
+void get_win_size(int *w, int *h);
+
 #define PDEBUG(cat, level, fmt, arg...) _printdebug(__FILE__, __FUNCTION__, __LINE__, cat, level, -1, fmt, ## arg)
 #define PDEBUG_CHAN(cat, level, fmt, arg...) _printdebug(__FILE__, __FUNCTION__, __LINE__, cat, level, CHAN, fmt, ## arg)
 void _printdebug(const char *file, const char *function, int line, int cat, int level, int chan, const char *fmt, ...) __attribute__ ((__format__ (__printf__, 7, 8)));
diff --git a/src/libdisplay/display.h b/src/libdisplay/display.h
index 6300948..f22fe3e 100644
--- a/src/libdisplay/display.h
+++ b/src/libdisplay/display.h
@@ -73,8 +73,6 @@ typedef struct display_spectrum {
 
 #define MAX_HEIGHT_STATUS 32
 
-void get_win_size(int *w, int *h);
-
 void display_wave_init(dispwav_t *disp, int samplerate, int kanal);
 void display_wave_on(int on);
 void display_wave(dispwav_t *disp, sample_t *samples, int length, double range);
diff --git a/src/libdisplay/display_wave.c b/src/libdisplay/display_wave.c
index 282c1c1..d5f285b 100644
--- a/src/libdisplay/display_wave.c
+++ b/src/libdisplay/display_wave.c
@@ -33,24 +33,6 @@ static int num_sender = 0;
 static char screen[HEIGHT][MAX_DISPLAY_WIDTH];
 static int wave_on = 0;
 
-void get_win_size(int *w, int *h)
-{
-	struct winsize win;
-	int rc;
-
-	rc = ioctl(0, TIOCGWINSZ, &win);
-	if (rc) {
-		*w = 80;
-		*h = 25;
-		return;
-	}
-
-	*h = win.ws_row;
-	*w = win.ws_col;
-	if (*w > MAX_DISPLAY_WIDTH - 1)
-		*w = MAX_DISPLAY_WIDTH - 1;
-}
-
 void display_wave_init(dispwav_t *disp, int samplerate, int kanal)
 {
 	memset(disp, 0, sizeof(*disp));
diff --git a/src/test/test_emphasis.c b/src/test/test_emphasis.c
index f5d41ff..a3198fc 100644
--- a/src/test/test_emphasis.c
+++ b/src/test/test_emphasis.c
@@ -36,8 +36,6 @@ static void gen_samples(sample_t *samples, double freq)
 }
 
 int num_kanal;
-int get_win_size;
-
 
 int main(void)
 {
diff --git a/src/test/test_filter.c b/src/test/test_filter.c
index 891bea6..7b7b676 100644
--- a/src/test/test_filter.c
+++ b/src/test/test_filter.c
@@ -35,7 +35,6 @@ static void gen_samples(sample_t *samples, double freq)
 }
 
 int num_kanal;
-int get_win_size;
 
 int main(void)
 {