X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fmainwindow.cpp;h=f33c57d6b2d24f6343c9bab2b04464e6ed489e8f;hb=f8da8feaff269b75480625e1384951c20c3a529d;hp=11e63913ea59734e9831ef5e625be3154020f704;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru diff --git a/nageru/mainwindow.cpp b/nageru/mainwindow.cpp index 11e6391..f33c57d 100644 --- a/nageru/mainwindow.cpp +++ b/nageru/mainwindow.cpp @@ -44,7 +44,7 @@ #include #include -#include "aboutdialog.h" +#include "shared/aboutdialog.h" #include "alsa_pool.h" #include "analyzer.h" #include "clickable_label.h" @@ -57,7 +57,7 @@ #include "input_mapping.h" #include "input_mapping_dialog.h" #include "lrameter.h" -#include "midi_mapping.pb.h" +#include "nageru_midi_mapping.pb.h" #include "midi_mapping_dialog.h" #include "mixer.h" #include "nonlinear_fader.h" @@ -253,30 +253,16 @@ MainWindow::MainWindow() qRegisterMetaType("Mixer::Output"); // Hook up the prev/next buttons on the audio views. - auto prev_page = [this]{ - if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) { - ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 2) % 3); - } else { - ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex()); // Switch between 0 and 2. - } - }; - auto next_page = [this]{ - if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) { - ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 1) % 3); - } else { - ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex()); // Switch between 0 and 2. - } - }; - connect(ui->compact_prev_page, &QAbstractButton::clicked, prev_page); - connect(ui->compact_next_page, &QAbstractButton::clicked, next_page); - connect(ui->full_prev_page, &QAbstractButton::clicked, prev_page); - connect(ui->full_next_page, &QAbstractButton::clicked, next_page); - connect(ui->video_grid_prev_page, &QAbstractButton::clicked, prev_page); - connect(ui->video_grid_next_page, &QAbstractButton::clicked, next_page); + connect(ui->compact_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page); + connect(ui->compact_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page); + connect(ui->full_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page); + connect(ui->full_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page); + connect(ui->video_grid_prev_page, &QAbstractButton::clicked, this, &MainWindow::prev_page); + connect(ui->video_grid_next_page, &QAbstractButton::clicked, this, &MainWindow::next_page); // And bind the same to PgUp/PgDown. - connect(new QShortcut(QKeySequence::MoveToNextPage, this), &QShortcut::activated, next_page); - connect(new QShortcut(QKeySequence::MoveToPreviousPage, this), &QShortcut::activated, prev_page); + connect(new QShortcut(QKeySequence::MoveToNextPage, this), &QShortcut::activated, this, &MainWindow::next_page); + connect(new QShortcut(QKeySequence::MoveToPreviousPage, this), &QShortcut::activated, this, &MainWindow::prev_page); // When the audio view changes, move the previews. connect(ui->audio_views, &QStackedWidget::currentChanged, bind(&MainWindow::audio_view_changed, this, _1)); @@ -295,7 +281,7 @@ MainWindow::MainWindow() if (!load_midi_mapping_from_file(global_flags.midi_mapping_filename, &midi_mapping)) { fprintf(stderr, "Couldn't load MIDI mapping '%s'; exiting.\n", global_flags.midi_mapping_filename.c_str()); - exit(1); + ::abort(); } midi_mapper.set_midi_mapping(midi_mapping); } @@ -306,6 +292,24 @@ MainWindow::MainWindow() } } +void MainWindow::prev_page() +{ + if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) { + ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 2) % 3); + } else { + ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex()); // Switch between 0 and 2. + } +} + +void MainWindow::next_page() +{ + if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::MULTICHANNEL) { + ui->audio_views->setCurrentIndex((ui->audio_views->currentIndex() + 1) % 3); + } else { + ui->audio_views->setCurrentIndex(2 - ui->audio_views->currentIndex()); // Switch between 0 and 2. + } +} + void MainWindow::resizeEvent(QResizeEvent* event) { QMainWindow::resizeEvent(event); @@ -663,7 +667,7 @@ void MainWindow::manual_triggered() void MainWindow::about_triggered() { - AboutDialog().exec(); + AboutDialog("Nageru", "Realtime video mixer").exec(); } void MainWindow::open_analyzer_triggered() @@ -877,22 +881,38 @@ void MainWindow::update_eq_label(unsigned bus_index, EQBand band, float gain_db) void MainWindow::setup_theme_menu() { - std::vector theme_menu_entries = global_mixer->get_theme_menu(); + Theme::MenuEntry *root_menu = global_mixer->get_theme_menu(); + // Remove the old menu, if any. if (theme_menu != nullptr) { ui->menuBar->removeAction(theme_menu->menuAction()); theme_menu = nullptr; } - if (!theme_menu_entries.empty()) { - theme_menu = new QMenu("&Theme"); - for (const Theme::MenuEntry &entry : theme_menu_entries) { - QAction *action = theme_menu->addAction(QString::fromStdString(entry.text)); - connect(action, &QAction::triggered, [entry] { - global_mixer->theme_menu_entry_clicked(entry.lua_ref); - }); + if (root_menu != nullptr) { + assert(root_menu->is_submenu); + if (!root_menu->submenu.empty()) { + theme_menu = new QMenu("&Theme"); + fill_menu_from_theme_menu(root_menu->submenu, theme_menu); + ui->menuBar->insertMenu(ui->menu_Help->menuAction(), theme_menu); } - ui->menuBar->insertMenu(ui->menu_Help->menuAction(), theme_menu); + } +} + +void MainWindow::fill_menu_from_theme_menu(const vector> &entries, QMenu *menu) +{ + for (const unique_ptr &entry : entries) { + if (entry->is_submenu) { + QMenu *submenu = new QMenu(QString::fromStdString(entry->text)); + fill_menu_from_theme_menu(entry->submenu, submenu); + menu->addMenu(submenu); + continue; + } + + QAction *action = menu->addAction(QString::fromStdString(entry->text)); + connect(action, &QAction::triggered, [lua_ref = entry->entry.lua_ref] { + global_mixer->theme_menu_entry_clicked(lua_ref); + }); } } @@ -1244,6 +1264,42 @@ void MainWindow::toggle_auto_makeup_gain() } } +void MainWindow::switch_video_channel(int channel_number) +{ + global_mixer->channel_clicked(channel_number); +} + +void MainWindow::apply_transition(int transition_number) +{ + global_mixer->transition_clicked(transition_number); +} + +void MainWindow::prev_audio_view() +{ + post_to_main_thread([this]{ + prev_page(); + }); +} + +void MainWindow::next_audio_view() +{ + post_to_main_thread([this]{ + next_page(); + }); +} + +void MainWindow::begin_new_segment() +{ + global_mixer->schedule_cut(); +} + +void MainWindow::exit() +{ + post_to_main_thread([this]{ + close(); + }); +} + void MainWindow::highlight_locut(bool highlight) { post_to_main_thread([this, highlight]{ @@ -1548,6 +1604,8 @@ void MainWindow::closeEvent(QCloseEvent *event) } analyzer->hide(); + global_mixer->quit(); + mixer_shutting_down(); event->accept(); }