X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mixer.h;h=c312ee3a756aed8e0ff35ccdc3b5c1d4947919ed;hb=12f9082b06c037b76dc3a653643bdaeaea89f2d2;hp=00c1e1519c7dddb2b648cc6ab952ee00d3e43cd6;hpb=538aa2fb443b25f34feafb4a50bb52206f7fe79c;p=nageru

diff --git a/mixer.h b/mixer.h
index 00c1e15..c312ee3 100644
--- a/mixer.h
+++ b/mixer.h
@@ -29,6 +29,8 @@
 #include "resampler.h"
 #include "theme.h"
 #include "timebase.h"
+#include "stereocompressor.h"
+#include "filter.h"
 
 class H264Encoder;
 class QSurface;
@@ -59,11 +61,8 @@ public:
 	enum Output {
 		OUTPUT_LIVE = 0,
 		OUTPUT_PREVIEW,
-		OUTPUT_INPUT0,
-		OUTPUT_INPUT1,
-		OUTPUT_INPUT2,
-		OUTPUT_INPUT3,
-		NUM_OUTPUTS
+		OUTPUT_INPUT0,  // 1, 2, 3, up to 15 follow numerically.
+		NUM_OUTPUTS = 18
 	};
 
 	struct DisplayFrame {
@@ -114,12 +113,28 @@ public:
 		return theme->get_num_channels();
 	}
 
+	std::string get_channel_name(unsigned channel) const
+	{
+		return theme->get_channel_name(channel);
+	}
+
+	bool get_supports_set_wb(unsigned channel) const
+	{
+		return theme->get_supports_set_wb(channel);
+	}
+
+	void set_wb(unsigned channel, double r, double g, double b) const
+	{
+		theme->set_wb(channel, r, g, b);
+	}
+
 private:
 	void bm_frame(unsigned card_index, uint16_t timecode,
 		FrameAllocator::Frame video_frame, size_t video_offset, uint16_t video_format,
 		FrameAllocator::Frame audio_frame, size_t audio_offset, uint16_t audio_format);
 	void place_rectangle(movit::Effect *resample_effect, movit::Effect *padding_effect, float x0, float y0, float x1, float y1);
 	void thread_func();
+	void process_audio_one_frame();
 	void subsample_chroma(GLuint src_tex, GLuint dst_dst);
 	void release_display_frame(DisplayFrame *frame);
 	double pts() { return double(pts_int) / TIMEBASE; }
@@ -148,11 +163,10 @@ private:
 		QSurface *surface;
 		QOpenGLContext *context;
 
-		bool new_data_ready = false;  // Whether new_frame and new_frame_audio contains anything.
+		bool new_data_ready = false;  // Whether new_frame contains anything.
 		bool should_quit = false;
 		RefCountedFrame new_frame;
 		GLsync new_data_ready_fence;  // Whether new_frame is ready for rendering.
-		std::vector<float> new_frame_audio;
 		std::condition_variable new_data_ready_changed;  // Set whenever new_data_ready is changed.
 		unsigned dropped_frames = 0;  // Before new_frame.
 
@@ -191,6 +205,11 @@ private:
 
 	// TODO: Implement oversampled peak detection.
 	float peak = 0.0f;
+
+	StereoFilter locut;  // Cutoff 150 Hz, 24 dB/oct.
+
+	// First compressor; takes us up to about -12 dBFS.
+	StereoCompressor level_compressor;
 };
 
 extern Mixer *global_mixer;