X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input_mapping_dialog.cpp;h=2d40cc2a500a839557e46aef541fa1c52677a86f;hb=95c6bc9d8e340b02112f713389390102d547cc4c;hp=54936a8312a52114dde2e23b7887be79d8196c68;hpb=99fe9fd44f57c9872eae24745da9c7a422ab0c98;p=nageru

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index 54936a8..2d40cc2 100644
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -11,7 +11,7 @@ InputMappingDialog::InputMappingDialog()
 	: ui(new Ui::InputMappingDialog),
 	  mapping(global_mixer->get_audio_mixer()->get_input_mapping()),
 	  old_mapping(mapping),
-	  card_names(global_mixer->get_audio_mixer()->get_names())
+	  devices(global_mixer->get_audio_mixer()->get_devices())
 {
 	ui->setupUi(this);
 	ui->table->setSelectionBehavior(QAbstractItemView::SelectRows);
@@ -53,12 +53,12 @@ void InputMappingDialog::fill_row_from_bus(unsigned row, const InputMapping::Bus
 	QComboBox *card_combo = new QComboBox;
 	unsigned current_index = 0;
 	card_combo->addItem(QString("(none)   "));
-	for (const auto &spec_and_name : card_names) {
+	for (const auto &spec_and_info : devices) {
 		++current_index;
 		card_combo->addItem(
-			QString::fromStdString(spec_and_name.second + "   "),
-			qulonglong(DeviceSpec_to_key(spec_and_name.first)));
-		if (bus.device == spec_and_name.first) {
+			QString::fromStdString(spec_and_info.second.name + "   "),
+			qulonglong(DeviceSpec_to_key(spec_and_info.first)));
+		if (bus.device == spec_and_info.first) {
 			card_combo->setCurrentIndex(current_index);
 		}
 	}
@@ -76,7 +76,10 @@ 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) {
-			for (unsigned source = 0; source < 8; ++source) {  // TODO: Ask the card about number of channels, and names.
+			auto device_it = devices.find(bus.device);
+			assert(device_it != devices.end());
+			unsigned num_device_channels = device_it->second.num_channels;
+			for (unsigned source = 0; source < num_device_channels; ++source) {
 				char buf[256];
 				snprintf(buf, sizeof(buf), "Channel %u   ", source + 1);
 				channel_combo->addItem(QString(buf));