X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.cpp;h=780bd52573c3380404cd77a36aa1892bfa8642cf;hb=ad9585b7a6671903cadcf6c74491646736db8e1e;hp=d7f86558e16a98d4ada1be0632f9489c3eb9294f;hpb=c558d684af1bcbbca87207ede74071850c835b7c;p=nageru

diff --git a/mixer.cpp b/mixer.cpp
index d7f8655..780bd52 100644
--- a/mixer.cpp
+++ b/mixer.cpp
@@ -3,7 +3,6 @@
 #include "mixer.h"
 
 #include <assert.h>
-#include <endian.h>
 #include <epoxy/egl.h>
 #include <movit/effect_chain.h>
 #include <movit/effect_util.h>
@@ -16,33 +15,37 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/resource.h>
-#include <sys/time.h>
-#include <time.h>
 #include <algorithm>
 #include <chrono>
-#include <cmath>
 #include <condition_variable>
 #include <cstddef>
+#include <cstdint>
 #include <memory>
 #include <mutex>
+#include <ratio>
 #include <string>
 #include <thread>
 #include <utility>
 #include <vector>
 
+#include "DeckLinkAPI.h"
+#include "LinuxCOM.h"
+#include "alsa_output.h"
 #include "bmusb/bmusb.h"
 #include "bmusb/fake_capture.h"
 #include "context.h"
-#include "db.h"
 #include "decklink_capture.h"
 #include "defs.h"
 #include "disk_space_estimator.h"
 #include "flags.h"
+#include "input_mapping.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_gl_sync.h"
+#include "resampling_queue.h"
 #include "timebase.h"
 #include "video_encoder.h"
 
+class IDeckLink;
 class QOpenGLContext;
 
 using namespace movit;
@@ -280,7 +283,7 @@ void Mixer::configure_card(unsigned card_index, CaptureInterface *capture, bool
 
 	DeviceSpec device{InputSourceType::CAPTURE_CARD, card_index};
 	audio_mixer.reset_resampler(device);
-	audio_mixer.set_name(device, card->capture->get_description());
+	audio_mixer.set_display_name(device, card->capture->get_description());
 	audio_mixer.trigger_state_changed_callback();
 }
 
@@ -857,7 +860,10 @@ void Mixer::audio_thread_func()
 
 		ResamplingQueue::RateAdjustmentPolicy rate_adjustment_policy =
 			task.adjust_rate ? ResamplingQueue::ADJUST_RATE : ResamplingQueue::DO_NOT_ADJUST_RATE;
-		vector<float> samples_out = audio_mixer.get_output(double(task.pts_int) / TIMEBASE, task.num_samples, rate_adjustment_policy);
+		vector<float> samples_out = audio_mixer.get_output(
+			double(task.pts_int) / TIMEBASE,
+			task.num_samples,
+			rate_adjustment_policy);
 
 		// Send the samples to the sound card, then add them to the output.
 		if (alsa) {