X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=audio_mixer.cpp;h=e7d545f69c6320c25cddcde039f3b100d8332529;hb=a5746714e6ca1e665bf9e74344e67712443f947a;hp=d2617f65e4fc1b4ba90648f22453928cb2f698db;hpb=80a2892bbe07a4e065704830e9e7244d2b1139fa;p=nageru

diff --git a/audio_mixer.cpp b/audio_mixer.cpp
index d2617f6..e7d545f 100644
--- a/audio_mixer.cpp
+++ b/audio_mixer.cpp
@@ -953,11 +953,15 @@ void AudioMixer::serialize_device(DeviceSpec device_spec, DeviceSpecProto *devic
 
 void AudioMixer::set_simple_input(unsigned card_index)
 {
+	assert(card_index < num_capture_cards + num_ffmpeg_inputs);
 	InputMapping new_input_mapping;
 	InputMapping::Bus input;
 	input.name = "Main";
-	input.device.type = InputSourceType::CAPTURE_CARD;
-	input.device.index = card_index;
+	if (card_index >= num_capture_cards) {
+		input.device = DeviceSpec{InputSourceType::FFMPEG_VIDEO_INPUT, card_index - num_capture_cards};
+	} else {
+		input.device = DeviceSpec{InputSourceType::CAPTURE_CARD, card_index};
+	}
 	input.source_channel[0] = 0;
 	input.source_channel[1] = 1;
 
@@ -977,6 +981,11 @@ unsigned AudioMixer::get_simple_input() const
 	    input_mapping.buses[0].source_channel[0] == 0 &&
 	    input_mapping.buses[0].source_channel[1] == 1) {
 		return input_mapping.buses[0].device.index;
+	} else if (input_mapping.buses.size() == 1 &&
+	           input_mapping.buses[0].device.type == InputSourceType::FFMPEG_VIDEO_INPUT &&
+	           input_mapping.buses[0].source_channel[0] == 0 &&
+	           input_mapping.buses[0].source_channel[1] == 1) {
+		return input_mapping.buses[0].device.index + num_capture_cards;
 	} else {
 		return numeric_limits<unsigned>::max();
 	}