X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=audio_mixer.h;h=ebe142a74cbc9e6f81d125505022d88588cb00cd;hb=80a2892bbe07a4e065704830e9e7244d2b1139fa;hp=17f95280e28eba8a9a85756cb24c626a6f3f858c;hpb=11a83c8d137baee4852ba23b2db77ab4132fee85;p=nageru

diff --git a/audio_mixer.h b/audio_mixer.h
index 17f9528..ebe142a 100644
--- a/audio_mixer.h
+++ b/audio_mixer.h
@@ -46,7 +46,7 @@ enum EQBand {
 
 class AudioMixer {
 public:
-	AudioMixer(unsigned num_cards);
+	AudioMixer(unsigned num_capture_cards, unsigned num_ffmpeg_inputs);
 	void reset_resampler(DeviceSpec device_spec);
 	void reset_meters();
 
@@ -327,13 +327,14 @@ private:
 	std::vector<DeviceSpec> get_active_devices() const;
 	void set_input_mapping_lock_held(const InputMapping &input_mapping);
 
-	unsigned num_cards;
+	unsigned num_capture_cards, num_ffmpeg_inputs;
 
 	mutable std::timed_mutex audio_mutex;
 
 	ALSAPool alsa_pool;
 	AudioDevice video_cards[MAX_VIDEO_CARDS];  // Under audio_mutex.
 	AudioDevice alsa_inputs[MAX_ALSA_CARDS];  // Under audio_mutex.
+	std::unique_ptr<AudioDevice[]> ffmpeg_inputs;  // Under audio_mutex.
 
 	std::atomic<float> locut_cutoff_hz{120};
 	StereoFilter locut[MAX_BUSES];  // Default cutoff 120 Hz, 24 dB/oct.