X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=mixer.h;h=f5aa4fbdd014758faa047f21bc4dfdf701467a81;hb=refs%2Fheads%2Fmultichannel_audio;hp=5c69edd4450ac4922b30ac05b52a6413c6fe2084;hpb=c015407a3953235df07a601baa6aa8e02ba7b561;p=nageru

diff --git a/mixer.h b/mixer.h
index 5c69edd..f5aa4fb 100644
--- a/mixer.h
+++ b/mixer.h
@@ -5,13 +5,11 @@
 
 #include <assert.h>
 #include <epoxy/gl.h>
+
 #undef Success
 
-#include <movit/effect_chain.h>
-#include <movit/flat_input.h>
 #include <stdbool.h>
 #include <stdint.h>
-
 #include <atomic>
 #include <chrono>
 #include <condition_variable>
@@ -25,34 +23,28 @@
 #include <thread>
 #include <vector>
 
-#include "alsa_output.h"
 #include "audio_mixer.h"
 #include "bmusb/bmusb.h"
 #include "defs.h"
 #include "httpd.h"
 #include "input_state.h"
+#include "libusb.h"
 #include "pbo_frame_allocator.h"
 #include "ref_counted_frame.h"
 #include "ref_counted_gl_sync.h"
-#include "resampling_queue.h"
 #include "theme.h"
 #include "timebase.h"
-#include "stereocompressor.h"
 #include "video_encoder.h"
 
 class ALSAOutput;
 class QSurface;
-class QuickSyncEncoder;
+
 namespace movit {
 class Effect;
 class EffectChain;
 class FlatInput;
 class ResourcePool;
 }  // namespace movit
-
-namespace movit {
-class YCbCrInput;
-}
 class QSurfaceFormat;
 
 // For any card that's not the master (where we pick out the frames as they
@@ -199,16 +191,6 @@ public:
 		return theme->map_signal(channel);
 	}
 
-	unsigned get_audio_source() const
-	{
-		return audio_source_channel;
-	}
-
-	void set_audio_source(unsigned channel)
-	{
-		audio_source_channel = channel;
-	}
-
 	unsigned get_master_clock() const
 	{
 		return master_clock_channel;
@@ -234,6 +216,7 @@ public:
 		theme->set_wb(channel, r, g, b);
 	}
 
+	// Note: You can also get this through the global variable global_audio_mixer.
 	AudioMixer *get_audio_mixer() { return &audio_mixer; }
 	const AudioMixer *get_audio_mixer() const { return &audio_mixer; }
 
@@ -367,7 +350,7 @@ private:
 		int last_timecode = -1;  // Unwrapped.
 	};
 	CaptureCard cards[MAX_VIDEO_CARDS];  // protected by <bmusb_mutex>
-	AudioMixer audio_mixer;
+	AudioMixer audio_mixer;  // Same as global_audio_mixer (see audio_mixer.h).
 	void get_one_frame_from_each_card(unsigned master_card_index, CaptureCard::NewFrame new_frames[MAX_VIDEO_CARDS], bool has_new_frame[MAX_VIDEO_CARDS], int num_samples[MAX_VIDEO_CARDS]);
 
 	InputState input_state;