X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=input_mapping_dialog.cpp;h=9e12c98c46cbd26e3a480a9ec76380faf9f7b8c9;hb=ffd68fbfb90242069af957f2a28908f0559f8348;hp=54936a8312a52114dde2e23b7887be79d8196c68;hpb=0f4b5fde73be7c8606d5812b8007cb23b8083bb6;p=nageru diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp index 54936a8..9e12c98 100644 --- a/input_mapping_dialog.cpp +++ b/input_mapping_dialog.cpp @@ -1,18 +1,43 @@ #include "input_mapping_dialog.h" -#include "ui_input_mapping.h" - +#include +#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "alsa_pool.h" +#include "defs.h" +#include "post_to_main_thread.h" +#include "ui_input_mapping.h" using namespace std; using namespace std::placeholders; InputMappingDialog::InputMappingDialog() : ui(new Ui::InputMappingDialog), - mapping(global_mixer->get_audio_mixer()->get_input_mapping()), + mapping(global_audio_mixer->get_input_mapping()), old_mapping(mapping), - card_names(global_mixer->get_audio_mixer()->get_names()) + devices(global_audio_mixer->get_devices()) { + for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) { + bus_settings.push_back(global_audio_mixer->get_bus_settings(bus_index)); + } + ui->setupUi(this); ui->table->setSelectionBehavior(QAbstractItemView::SelectRows); ui->table->setSelectionMode(QAbstractItemView::SingleSelection); // Makes implementing moving easier for now. @@ -25,9 +50,26 @@ InputMappingDialog::InputMappingDialog() connect(ui->remove_button, &QPushButton::clicked, this, &InputMappingDialog::remove_clicked); connect(ui->up_button, &QPushButton::clicked, bind(&InputMappingDialog::updown_clicked, this, -1)); connect(ui->down_button, &QPushButton::clicked, bind(&InputMappingDialog::updown_clicked, this, 1)); + connect(ui->save_button, &QPushButton::clicked, this, &InputMappingDialog::save_clicked); + connect(ui->load_button, &QPushButton::clicked, this, &InputMappingDialog::load_clicked); update_button_state(); connect(ui->table, &QTableWidget::itemSelectionChanged, this, &InputMappingDialog::update_button_state); + + saved_callback = global_audio_mixer->get_state_changed_callback(); + global_audio_mixer->set_state_changed_callback([this]{ + post_to_main_thread([this]{ + devices = global_audio_mixer->get_devices(); + for (unsigned row = 0; row < mapping.buses.size(); ++row) { + fill_row_from_bus(row, mapping.buses[row]); + } + }); + }); +} + +InputMappingDialog::~InputMappingDialog() +{ + global_audio_mixer->set_state_changed_callback(saved_callback); } void InputMappingDialog::fill_ui_from_mapping(const InputMapping &mapping) @@ -49,19 +91,47 @@ void InputMappingDialog::fill_row_from_bus(unsigned row, const InputMapping::Bus QString name(QString::fromStdString(bus.name)); ui->table->setItem(row, 0, new QTableWidgetItem(name)); - // Card choices. - QComboBox *card_combo = new QComboBox; + // Card choices. If there's already a combobox here, we try to modify + // the elements in-place, so that the UI doesn't go away under the user's feet + // if they are in the process of choosing an item. + QComboBox *card_combo = static_cast(ui->table->cellWidget(row, 1)); + if (card_combo == nullptr) { + card_combo = new QComboBox; + } unsigned current_index = 0; - card_combo->addItem(QString("(none) ")); - for (const auto &spec_and_name : card_names) { + if (card_combo->count() == 0) { + card_combo->addItem(QString("(none) ")); + } + for (const auto &spec_and_info : devices) { + QString label(QString::fromStdString(spec_and_info.second.display_name)); + if (spec_and_info.first.type == InputSourceType::ALSA_INPUT) { + ALSAPool::Device::State state = global_audio_mixer->get_alsa_card_state(spec_and_info.first.index); + if (state == ALSAPool::Device::State::EMPTY) { + continue; + } else if (state == ALSAPool::Device::State::STARTING) { + label += " (busy)"; + } else if (state == ALSAPool::Device::State::DEAD) { + label += " (dead)"; + } + } ++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) { + if (unsigned(card_combo->count()) > current_index) { + card_combo->setItemText(current_index, label + " "); + card_combo->setItemData(current_index, qulonglong(DeviceSpec_to_key(spec_and_info.first))); + } else { + card_combo->addItem( + label + " ", + qulonglong(DeviceSpec_to_key(spec_and_info.first))); + } + if (bus.device == spec_and_info.first) { card_combo->setCurrentIndex(current_index); } } + // Remove any excess items from earlier. (This is only for paranoia; + // they should be held, so it shouldn't matter.) + while (unsigned(card_combo->count()) > current_index + 1) { + card_combo->removeItem(current_index + 1); + } connect(card_combo, static_cast(&QComboBox::currentIndexChanged), bind(&InputMappingDialog::card_selected, this, card_combo, row, _1)); ui->table->setCellWidget(row, 1, card_combo); @@ -72,11 +142,17 @@ void InputMappingDialog::fill_row_from_bus(unsigned row, const InputMapping::Bus void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const InputMapping::Bus &bus) { // Left and right channel. + // TODO: If there's already a widget here, modify it instead of creating a new one, + // as we do with card choices. for (unsigned channel = 0; channel < 2; ++channel) { 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. + if (bus.device.type == InputSourceType::CAPTURE_CARD || + bus.device.type == InputSourceType::ALSA_INPUT) { + 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)); @@ -93,13 +169,19 @@ void InputMappingDialog::setup_channel_choices_from_bus(unsigned row, const Inpu void InputMappingDialog::ok_clicked() { - global_mixer->get_audio_mixer()->set_input_mapping(mapping); + global_audio_mixer->set_state_changed_callback(saved_callback); + global_audio_mixer->set_input_mapping(mapping); + for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) { + global_audio_mixer->set_bus_settings(bus_index, bus_settings[bus_index]); + global_audio_mixer->reset_peak(bus_index); + } accept(); } void InputMappingDialog::cancel_clicked() { - global_mixer->get_audio_mixer()->set_input_mapping(old_mapping); + global_audio_mixer->set_state_changed_callback(saved_callback); + global_audio_mixer->set_input_mapping(old_mapping); reject(); } @@ -133,6 +215,7 @@ void InputMappingDialog::add_clicked() new_bus.name = "New input"; new_bus.device.type = InputSourceType::SILENCE; mapping.buses.push_back(new_bus); + bus_settings.push_back(AudioMixer::get_default_bus_settings()); ui->table->setRowCount(mapping.buses.size()); unsigned row = mapping.buses.size() - 1; @@ -158,6 +241,7 @@ void InputMappingDialog::remove_clicked() for (int row : rows_to_delete) { ui->table->removeRow(row); mapping.buses.erase(mapping.buses.begin() + row); + bus_settings.erase(bus_settings.begin() + row); } update_button_state(); } @@ -170,6 +254,7 @@ void InputMappingDialog::updown_clicked(int direction) int b_row = range.bottomRow() + direction; swap(mapping.buses[a_row], mapping.buses[b_row]); + swap(bus_settings[a_row], bus_settings[b_row]); fill_row_from_bus(a_row, mapping.buses[a_row]); fill_row_from_bus(b_row, mapping.buses[b_row]); @@ -179,6 +264,53 @@ void InputMappingDialog::updown_clicked(int direction) ui->table->setRangeSelected(b_sel, true); } +void InputMappingDialog::save_clicked() +{ +#if HAVE_CEF + // 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; +#endif + QString filename = QFileDialog::getSaveFileName(this, + "Save input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options); + if (!filename.endsWith(".mapping")) { + filename += ".mapping"; + } + if (!save_input_mapping_to_file(devices, mapping, filename.toStdString())) { + QMessageBox box; + box.setText("Could not save mapping to '" + filename + "'. Check that you have the right permissions and try again."); + box.exec(); + } +} + +void InputMappingDialog::load_clicked() +{ +#if HAVE_CEF + // 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; +#endif + QString filename = QFileDialog::getOpenFileName(this, + "Load input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options); + InputMapping new_mapping; + if (!load_input_mapping_from_file(devices, filename.toStdString(), &new_mapping)) { + QMessageBox box; + box.setText("Could not load mapping from '" + filename + "'. Check that the file exists, has the right permissions and is valid."); + box.exec(); + return; + } + + mapping = new_mapping; + bus_settings.clear(); + for (unsigned bus_index = 0; bus_index < mapping.buses.size(); ++bus_index) { + bus_settings.push_back(global_audio_mixer->get_bus_settings(bus_index)); + } + devices = global_audio_mixer->get_devices(); // New dead cards may have been made. + fill_ui_from_mapping(mapping); +} + void InputMappingDialog::update_button_state() { ui->add_button->setDisabled(mapping.buses.size() >= MAX_BUSES);