Fix compilation with SRT and CEF together (macro conflict via sys/syslog.h).

[nageru] / nageru / mixer.cpp

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 3ca249b1a5094ecf5003233f9fb1f5c3732bf680..736ceb22f6f98713a76e90361f9f0e4abeaeb178 100644 (file)
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -35,6 +35,8 @@
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #ifdef HAVE_CEF
+#undef LOG_INFO
+#undef LOG_WARNING
 #include "cef_capture.h"
 #endif
 #include "chroma_subsampler.h"
@@ -580,9 +582,7 @@ Mixer::~Mixer()
 void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, CardType card_type, DeckLinkOutput *output, bool is_srt_card)
 {
        bool is_active = capture != nullptr;
-       if (is_active) {
-               printf("Configuring card %d...\n", card_index);
-       } else {
+       if (!is_active) {
                assert(card_type == CardType::FAKE_CAPTURE);
        }