AJA: do not print debug messages [MSW]

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 = {

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;

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