Release Nageru 1.7.2.

[nageru] / input_mapping_dialog.cpp

diff --git a/input_mapping_dialog.cpp b/input_mapping_dialog.cpp
index 232a88db20c795acfd869f1dd1b03bb13a0b9bf2..e26649d544fea217778145e1b0ea66daecaf019f 100644 (file)
--- a/input_mapping_dialog.cpp
+++ b/input_mapping_dialog.cpp
@@ -1,11 +1,29 @@
 #include "input_mapping_dialog.h"
 
-#include "post_to_main_thread.h"
-#include "ui_input_mapping.h"
-
+#include <assert.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <QAbstractItemView>
 #include <QComboBox>
+#include <QDialogButtonBox>
 #include <QFileDialog>
+#include <QHeaderView>
+#include <QList>
 #include <QMessageBox>
+#include <QPushButton>
+#include <QTableWidget>
+#include <QVariant>
+#include <functional>
+#include <memory>
+#include <set>
+#include <string>
+#include <utility>
+
+#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;
@@ -16,6 +34,10 @@ InputMappingDialog::InputMappingDialog()
          old_mapping(mapping),
          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.
@@ -126,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;
@@ -137,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),
@@ -149,6 +173,10 @@ void InputMappingDialog::ok_clicked()
 {
        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();
 }
 
@@ -189,6 +217,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;
@@ -214,6 +243,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();
 }
@@ -226,6 +256,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]);
 
@@ -237,8 +268,14 @@ void InputMappingDialog::updown_clicked(int direction)
 
 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)"));
+               "Save input mapping", QString(), tr("Mapping files (*.mapping)"), /*selectedFilter=*/nullptr, options);
        if (!filename.endsWith(".mapping")) {
                filename += ".mapping";
        }
@@ -251,8 +288,14 @@ void InputMappingDialog::save_clicked()
 
 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)"));
+               "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;
@@ -262,6 +305,10 @@ void InputMappingDialog::load_clicked()
        }
 
        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);
 }