X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=f312705dac51839739fe206033b26a81373dd40a;hb=afe996bc7dfc8689ca356d00824fbfcd632f93a2;hp=17209408d4668d6eb07450b83bbbcfe8c6aea2eb;hpb=6379b0adf2cee84b46d5a0d8e2ee5e6a7d1615cf;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index 1720940..f312705 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -26,6 +26,7 @@
 #include "input_mapping_dialog.h"
 #include "lrameter.h"
 #include "midi_mapping.pb.h"
+#include "midi_mapping_dialog.h"
 #include "mixer.h"
 #include "post_to_main_thread.h"
 #include "ui_audio_miniview.h"
@@ -169,6 +170,7 @@ MainWindow::MainWindow()
 	connect(ui->simple_audio_mode, &QAction::triggered, this, &MainWindow::simple_audio_mode_triggered);
 	connect(ui->multichannel_audio_mode, &QAction::triggered, this, &MainWindow::multichannel_audio_mode_triggered);
 	connect(ui->input_mapping_action, &QAction::triggered, this, &MainWindow::input_mapping_triggered);
+	connect(ui->midi_mapping_action, &QAction::triggered, this, &MainWindow::midi_mapping_triggered);
 
 	if (global_flags.x264_video_to_http) {
 		connect(ui->x264_bitrate_action, &QAction::triggered, this, &MainWindow::x264_bitrate_triggered);
@@ -342,6 +344,7 @@ void MainWindow::reset_audio_mapping_ui()
 	ui->simple_audio_mode->setChecked(simple);
 	ui->multichannel_audio_mode->setChecked(!simple);
 	ui->input_mapping_action->setEnabled(!simple);
+	ui->midi_mapping_action->setEnabled(!simple);
 
 	ui->locut_enabled->setVisible(simple);
 	ui->gainstaging_label->setVisible(simple);
@@ -563,6 +566,11 @@ void MainWindow::input_mapping_triggered()
 	}
 }
 
+void MainWindow::midi_mapping_triggered()
+{
+	MIDIMappingDialog(&midi_mapper).exec();
+}
+
 void MainWindow::gain_staging_knob_changed(unsigned bus_index, int value)
 {
 	if (bus_index == 0) {