From: Steinar H. Gunderson Date: Sat, 30 Jul 2016 10:23:44 +0000 (+0200) Subject: Add a beginning UI for mapping inputs. No logic connected yet. X-Git-Tag: 1.4.0~122 X-Git-Url: https://git.sesse.net/?p=nageru;a=commitdiff_plain;h=c19209ad2d9f862ae634fefb4b7bb2e30bfc3dc1 Add a beginning UI for mapping inputs. No logic connected yet. --- diff --git a/.gitignore b/.gitignore index 40faeed..070c8fc 100644 --- a/.gitignore +++ b/.gitignore @@ -4,5 +4,6 @@ ui_aboutdialog.h ui_audio_miniview.h ui_display.h +ui_input_mapping.h ui_mainwindow.h nageru diff --git a/Makefile b/Makefile index 9cdc9cd..8479712 100644 --- a/Makefile +++ b/Makefile @@ -13,8 +13,8 @@ endif LDLIBS=$(shell pkg-config --libs $(PKG_MODULES)) -pthread -lva -lva-drm -lva-x11 -lX11 -lavformat -lavcodec -lavutil -lswscale -lavresample -lzita-resampler -lasound -ldl # Qt objects -OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o correlation_meter.o aboutdialog.o -OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o correlation_meter.moc.o aboutdialog.moc.o ellipsis_label.moc.o +OBJS=glwidget.o main.o mainwindow.o vumeter.o lrameter.o vu_common.o correlation_meter.o aboutdialog.o input_mapping_dialog.o +OBJS += glwidget.moc.o mainwindow.moc.o vumeter.moc.o lrameter.moc.o correlation_meter.moc.o aboutdialog.moc.o ellipsis_label.moc.o input_mapping_dialog.moc.o # Mixer objects OBJS += mixer.o audio_mixer.o pbo_frame_allocator.o context.o ref_counted_frame.o theme.o resampling_queue.o httpd.o ebu_r128_proc.o flags.o image_input.o stereocompressor.o filter.o alsa_output.o correlation_measurer.o disk_space_estimator.o @@ -50,6 +50,8 @@ mainwindow.o: mainwindow.cpp ui_mainwindow.h ui_display.h ui_audio_miniview.h aboutdialog.o: aboutdialog.cpp ui_aboutdialog.h +input_mapping_dialog.o: input_mapping_dialog.cpp ui_input_mapping.h + DEPS=$(OBJS:.o=.d) -include $(DEPS) diff --git a/input_mapping_dialog.h b/input_mapping_dialog.h new file mode 100644 index 0000000..c7fea24 --- /dev/null +++ b/input_mapping_dialog.h @@ -0,0 +1,26 @@ +#ifndef _INPUT_MAPPING_DIALOG_H +#define _INPUT_MAPPING_DIALOG_H + +#include +#include +#include +#include + +#include "mixer.h" + +namespace Ui { +class InputMappingDialog; +} // namespace Ui + +class InputMappingDialog : public QDialog +{ + Q_OBJECT + +public: + InputMappingDialog(); + +private: + Ui::InputMappingDialog *ui; +}; + +#endif // !defined(_INPUT_MAPPING_DIALOG_H) diff --git a/mainwindow.cpp b/mainwindow.cpp index f13b4ea..23d76ab 100644 --- a/mainwindow.cpp +++ b/mainwindow.cpp @@ -22,6 +22,7 @@ #include "disk_space_estimator.h" #include "flags.h" #include "glwidget.h" +#include "input_mapping_dialog.h" #include "lrameter.h" #include "mixer.h" #include "post_to_main_thread.h" @@ -109,6 +110,7 @@ MainWindow::MainWindow() connect(ui->cut_action, &QAction::triggered, this, &MainWindow::cut_triggered); connect(ui->exit_action, &QAction::triggered, this, &MainWindow::exit_triggered); connect(ui->about_action, &QAction::triggered, this, &MainWindow::about_triggered); + connect(ui->input_mapping_action, &QAction::triggered, this, &MainWindow::input_mapping_triggered); if (global_flags.x264_video_to_http) { connect(ui->x264_bitrate_action, &QAction::triggered, this, &MainWindow::x264_bitrate_triggered); @@ -278,6 +280,11 @@ void MainWindow::about_triggered() AboutDialog().exec(); } +void MainWindow::input_mapping_triggered() +{ + InputMappingDialog().exec(); +} + void MainWindow::gain_staging_knob_changed(int value) { ui->gainstaging_auto_checkbox->setCheckState(Qt::Unchecked); diff --git a/mainwindow.h b/mainwindow.h index c44c0f2..8052516 100644 --- a/mainwindow.h +++ b/mainwindow.h @@ -39,6 +39,7 @@ public slots: void x264_bitrate_triggered(); void exit_triggered(); void about_triggered(); + void input_mapping_triggered(); void transition_clicked(int transition_number); void channel_clicked(int channel_number); void wb_button_clicked(int channel_number); diff --git a/ui_input_mapping.ui b/ui_input_mapping.ui new file mode 100644 index 0000000..82a0d3d --- /dev/null +++ b/ui_input_mapping.ui @@ -0,0 +1,190 @@ + + + InputMappingDialog + + + + 0 + 0 + 879 + 583 + + + + Input mapping + + + + + + + Device + + + + + Left input + + + + + Right input + + + + + + + + + + + 0 + 0 + + + + + 30 + 30 + + + + + + + + + + + + + + + 0 + 0 + + + + + 30 + 30 + + + + + + + + .. + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + 30 + 30 + + + + + + + + + + + + + + + 30 + 30 + + + + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Cancel|QDialogButtonBox::Ok + + + + + + + + + + + buttonBox + accepted() + Dialog + accept() + + + 248 + 254 + + + 157 + 274 + + + + + buttonBox + rejected() + Dialog + reject() + + + 316 + 260 + + + 286 + 274 + + + + + diff --git a/ui_mainwindow.ui b/ui_mainwindow.ui index e006c9a..3a55b88 100644 --- a/ui_mainwindow.ui +++ b/ui_mainwindow.ui @@ -925,7 +925,14 @@ + + + &Audio + + + + @@ -948,6 +955,11 @@ Change &x264 bitrate… + + + &Input mapping… + +