From f0e75034824d071532a161f05d74e403feedba2c Mon Sep 17 00:00:00 2001
From: Martin Pulec <martin.pulec@cesnet.cz>
Date: Mon, 1 Jul 2019 15:32:00 +0200
Subject: [PATCH] AJA: do not print debug messages [MSW]

---
 src/aja_common.h          | 7 +++++++
 src/video_capture/aja.cpp | 3 ---
 src/video_display/aja.cpp | 6 ++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/aja_common.h b/src/aja_common.h
index aa28b496d..1a9076445 100644
--- a/src/aja_common.h
+++ b/src/aja_common.h
@@ -35,11 +35,18 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <iostream>
 #include <map>
 #include <ntv2enums.h>
 
 #include "types.h"
 
+#ifdef _MSC_VER
+#define log_msg(x, ...) fprintf(stderr, __VA_ARGS__)
+#undef LOG
+#define LOG(level) if (level > log_level) ; else std::cerr
+#endif
+
 namespace ultragrid {
 namespace aja {
 static const std::map<NTV2FrameBufferFormat, codec_t> codec_map = {
diff --git a/src/video_capture/aja.cpp b/src/video_capture/aja.cpp
index ba90b9d78..ac96eed12 100644
--- a/src/video_capture/aja.cpp
+++ b/src/video_capture/aja.cpp
@@ -94,9 +94,6 @@
 namespace aja = ultragrid::aja;
 
 #ifdef _MSC_VER
-#define log_msg(x, ...) fprintf(stderr, __VA_ARGS__)
-#undef LOG
-#define LOG(...) std::cerr
 extern "C" __declspec(dllexport) unsigned int *aja_audio_capture_channels = NULL;
 extern "C" __declspec(dllexport) volatile bool *aja_should_exit = NULL;
 volatile int log_level = 5;
diff --git a/src/video_display/aja.cpp b/src/video_display/aja.cpp
index af4111744..3b2fa5f5c 100644
--- a/src/video_display/aja.cpp
+++ b/src/video_display/aja.cpp
@@ -64,7 +64,6 @@
 #include <thread>
 #include <vector>
 
-#include "aja_common.h"
 #include "audio/types.h"
 #include "debug.h"
 #include "host.h"
@@ -73,6 +72,8 @@
 #include "rang.hpp"
 #include "video.h"
 
+#include "aja_common.h" // should be included last (overrides log_msg etc.)
+
 #define DEFAULT_MAX_FRAME_QUEUE_LEN 1
 #define MODULE_NAME "[AJA display] "
 /**
@@ -87,9 +88,6 @@
 #define SAMPLE_RATE             48000
 
 #ifdef _MSC_VER
-#define log_msg(x, ...) fprintf(stderr, __VA_ARGS__)
-#undef LOG
-#define LOG(...) std::cerr
 extern "C" __declspec(dllexport) int *aja_display_init_noerr;
 int *aja_display_init_noerr;
 #else