X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input_mapping_dialog.cpp;h=23e889531e354fc04589b0fc09ac72c84ff4d648;hb=6ffaabac0a523617b686f40c154a25cb548cc561;hp=9e12c98c46cbd26e3a480a9ec76380faf9f7b8c9;hpb=ffd68fbfb90242069af957f2a28908f0559f8348;p=nageru

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index 9e12c98..23e8895 100644
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -148,7 +148,8 @@ void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const Inpu
 		QComboBox *channel_combo = new QComboBox;
 		channel_combo->addItem(QString("(none)"));
 		if (bus.device.type == InputSourceType::CAPTURE_CARD ||
-		    bus.device.type == InputSourceType::ALSA_INPUT) {
+		    bus.device.type == InputSourceType::ALSA_INPUT ||
+		    bus.device.type == InputSourceType::FFMPEG_VIDEO_INPUT) {
 			auto device_it = devices.find(bus.device);
 			assert(device_it != devices.end());
 			unsigned num_device_channels = device_it->second.num_channels;
@@ -159,6 +160,7 @@ void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const Inpu
 			}
 			channel_combo->setCurrentIndex(bus.source_channel[channel] + 1);
 		} else {
+			assert(bus.device.type == InputSourceType::SILENCE);
 			channel_combo->setCurrentIndex(0);
 		}
 		connect(channel_combo, static_cast<void(QComboBox::*)(int)>(&QComboBox::currentIndexChanged),
@@ -270,7 +272,7 @@ void InputMappingDialog::save_clicked()
 	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
 	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
 #else
-	QFileDialog::Option options;
+	QFileDialog::Option options(QFileDialog::Option(0));
 #endif
 	QString filename = QFileDialog::getSaveFileName(this,
 		"Save input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options);
@@ -290,7 +292,7 @@ void InputMappingDialog::load_clicked()
 	// The native file dialog uses GTK+, which interferes with CEF's use of the GLib main loop.
 	QFileDialog::Option options(QFileDialog::DontUseNativeDialog);
 #else
-	QFileDialog::Option options;
+	QFileDialog::Option options(QFileDialog::Option(0));
 #endif
 	QString filename = QFileDialog::getOpenFileName(this,
 		"Load input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options);