X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmixer.cpp;h=b3e60feba560a261d25e63b2fc2fc42c99505bc3;hb=f81ae3be1aae619fe4ad022f55d95a4a83ace076;hp=3ca249b1a5094ecf5003233f9fb1f5c3732bf680;hpb=435d5e4f35ffd433e5cf9a6b372c9de662a9afa9;p=nageru

diff --git a/nageru/mixer.cpp b/nageru/mixer.cpp
index 3ca249b..b3e60fe 100644
--- a/nageru/mixer.cpp
+++ b/nageru/mixer.cpp
@@ -1,9 +1,16 @@
-#undef Success
-
 #include "mixer.h"
 
+#include <X11/Xlib.h>
+#include <algorithm>
 #include <assert.h>
+#include <chrono>
+#include <condition_variable>
 #include <epoxy/egl.h>
+#include <functional>
+#include <iterator>
+#include <map>
+#include <math.h>
+#include <memory>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -11,19 +18,21 @@
 #include <movit/image_format.h>
 #include <movit/init.h>
 #include <movit/resource_pool.h>
+#include <movit/util.h>
+#include <movit/ycbcr.h>
+#include <movit/ycbcr_input.h>
+#include <mutex>
+#include <netinet/in.h>
 #include <pthread.h>
+#include <stddef.h>
+#include <stdint.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
-#include <algorithm>
-#include <chrono>
-#include <condition_variable>
-#include <cstddef>
-#include <cstdint>
-#include <memory>
-#include <mutex>
-#include <ratio>
+#include <string.h>
 #include <string>
+#include <sys/socket.h>
+#include <sys/syslog.h>
 #include <thread>
 #include <utility>
 #include <vector>
@@ -31,33 +40,42 @@
 #include "DeckLinkAPI.h"
 #include "LinuxCOM.h"
 #include "alsa_output.h"
+#include "audio_mixer.h"
 #include "basic_stats.h"
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #ifdef HAVE_CEF
+#undef LOG_INFO
+#undef LOG_WARNING
 #include "cef_capture.h"
 #endif
+#include "card_type.h"
 #include "chroma_subsampler.h"
-#include "shared/context.h"
 #include "decklink_capture.h"
 #include "decklink_output.h"
 #include "decklink_util.h"
 #include "defs.h"
-#include "shared/disk_space_estimator.h"
 #include "ffmpeg_capture.h"
 #include "flags.h"
 #include "image_input.h"
 #include "input_mapping.h"
-#include "shared/metrics.h"
-#include "shared/va_display.h"
+#include "input_state.h"
+#include "libusb.h"
 #include "mjpeg_encoder.h"
 #include "pbo_frame_allocator.h"
-#include "shared/ref_counted_gl_sync.h"
+#include "queue_length_policy.h"
 #include "resampling_queue.h"
+#include "shared/context.h"
+#include "shared/disk_space_estimator.h"
+#include "shared/metrics.h"
+#include "shared/ref_counted_gl_sync.h"
+#include "shared/shared_defs.h"
 #include "shared/timebase.h"
+#include "theme.h"
 #include "timecode_renderer.h"
 #include "v210_converter.h"
 #include "video_encoder.h"
+#include "ycbcr_interpretation.h"
 
 #undef Status
 #include <google/protobuf/util/json_util.h>
@@ -580,9 +598,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);
 	}