X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=glwidget.cpp;h=3aa10fad1032b0e88b71f8b6e56294d1f9fc1139;hb=402b3d36c13bb04e9a2f690c5c12d8f85d6dc415;hp=5a1325803a283fad20cf8be86478d94945b66ca5;hpb=1202ad9167357a461366dab9cbbaa6c578423253;p=nageru diff --git a/glwidget.cpp b/glwidget.cpp index 5a13258..3aa10fa 100644 --- a/glwidget.cpp +++ b/glwidget.cpp @@ -1,32 +1,31 @@ -#include // Needs to come before egl.h. -#include // Needs to come before egl.h. -#include // Needs to come before egl.h. -#include // Needs to come before egl.h. -#include // Needs to come before egl.h. -#include // Needs to come before egl.h. -#include -#include -#include -#include -#include - #include "glwidget.h" -#include -#include -#include +#include +#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include "audio_mixer.h" #include "context.h" #include "flags.h" #include "mainwindow.h" #include "mixer.h" -#include "qnamespace.h" #include "ref_counted_gl_sync.h" class QMouseEvent; -class QWidget; #undef Success #include @@ -53,16 +52,26 @@ void GLWidget::initializeGL() static once_flag flag; call_once(flag, [this]{ global_mixer = new Mixer(QGLFormat::toSurfaceFormat(format()), global_flags.num_cards); + global_audio_mixer = global_mixer->get_audio_mixer(); global_mainwindow->mixer_created(global_mixer); global_mixer->start(); }); global_mixer->set_frame_ready_callback(output, [this]{ QMetaObject::invokeMethod(this, "update", Qt::AutoConnection); - emit transition_names_updated(global_mixer->get_transition_names()); - emit resolution_updated(output); }); - + if (output == Mixer::OUTPUT_LIVE) { + global_mixer->set_transition_names_updated_callback(output, [this](const vector &names){ + emit transition_names_updated(names); + }); + } if (output >= Mixer::OUTPUT_INPUT0) { + global_mixer->set_name_updated_callback(output, [this](const string &name){ + emit name_updated(output, name); + }); + global_mixer->set_color_updated_callback(output, [this](const string &color){ + emit color_updated(output, color); + }); + int signal_num = global_mixer->get_channel_signal(output); if (signal_num != -1) { setContextMenuPolicy(Qt::CustomContextMenu); @@ -138,11 +147,50 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos) card_submenu.setTitle("Input source"); menu.addMenu(&card_submenu); - // Add a submenu for selecting resolution, with an action for each resolution. - // Note that the choice depends a lot on which card is active. + // --- The choices in the next few options depend a lot on which card is active --- + + // Add a submenu for selecting video input, with an action for each input. + QMenu video_input_submenu; + QActionGroup video_input_group(&video_input_submenu); + std::map video_inputs = global_mixer->get_available_video_inputs(current_card); + uint32_t current_video_input = global_mixer->get_current_video_input(current_card); + for (const auto &mode : video_inputs) { + QString description(QString::fromStdString(mode.second)); + QAction *action = new QAction(description, &video_input_group); + action->setCheckable(true); + if (mode.first == current_video_input) { + action->setChecked(true); + } + action->setData(QList{"video_input", mode.first}); + video_input_submenu.addAction(action); + } + + video_input_submenu.setTitle("Video input"); + menu.addMenu(&video_input_submenu); + + // The same for audio input. + QMenu audio_input_submenu; + QActionGroup audio_input_group(&audio_input_submenu); + std::map audio_inputs = global_mixer->get_available_audio_inputs(current_card); + uint32_t current_audio_input = global_mixer->get_current_audio_input(current_card); + for (const auto &mode : audio_inputs) { + QString description(QString::fromStdString(mode.second)); + QAction *action = new QAction(description, &audio_input_group); + action->setCheckable(true); + if (mode.first == current_audio_input) { + action->setChecked(true); + } + action->setData(QList{"audio_input", mode.first}); + audio_input_submenu.addAction(action); + } + + audio_input_submenu.setTitle("Audio input"); + menu.addMenu(&audio_input_submenu); + + // The same for resolution. QMenu mode_submenu; QActionGroup mode_group(&mode_submenu); - std::map video_modes = global_mixer->get_available_video_modes(current_card); + std::map video_modes = global_mixer->get_available_video_modes(current_card); uint32_t current_video_mode = global_mixer->get_current_video_mode(current_card); bool has_auto_mode = false; for (const auto &mode : video_modes) { @@ -172,19 +220,35 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos) mode_submenu.setTitle("Input mode"); menu.addMenu(&mode_submenu); + // --- End of card-dependent choices --- + // Add an audio source selector. - QAction *audio_source_action = new QAction("Use as audio source", &menu); - audio_source_action->setCheckable(true); - if (global_mixer->get_audio_source() == signal_num) { - audio_source_action->setChecked(true); - audio_source_action->setEnabled(false); + QAction *audio_source_action = nullptr; + if (global_audio_mixer->get_mapping_mode() == AudioMixer::MappingMode::SIMPLE) { + audio_source_action = new QAction("Use as audio source", &menu); + audio_source_action->setCheckable(true); + if (global_audio_mixer->get_simple_input() == signal_num) { + audio_source_action->setChecked(true); + audio_source_action->setEnabled(false); + } + menu.addAction(audio_source_action); + } + + // And a master clock selector. + QAction *master_clock_action = new QAction("Use as master clock", &menu); + master_clock_action->setCheckable(true); + if (global_mixer->get_master_clock() == signal_num) { + master_clock_action->setChecked(true); + master_clock_action->setEnabled(false); } - menu.addAction(audio_source_action); + menu.addAction(master_clock_action); // Show the menu and look at the result. QAction *selected_item = menu.exec(global_pos); - if (selected_item == audio_source_action) { - global_mixer->set_audio_source(signal_num); + if (audio_source_action != nullptr && selected_item == audio_source_action) { + global_audio_mixer->set_simple_input(signal_num); + } else if (selected_item == master_clock_action) { + global_mixer->set_master_clock(signal_num); } else if (selected_item != nullptr) { QList selected = selected_item->data().toList(); if (selected[0].toString() == "video_mode") { @@ -194,6 +258,12 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos) } else { global_mixer->set_video_mode(current_card, mode); } + } else if (selected[0].toString() == "video_input") { + uint32_t input = selected[1].toUInt(nullptr); + global_mixer->set_video_input(current_card, input); + } else if (selected[0].toString() == "audio_input") { + uint32_t input = selected[1].toUInt(nullptr); + global_mixer->set_audio_input(current_card, input); } else if (selected[0].toString() == "card") { unsigned card_index = selected[1].toUInt(nullptr); global_mixer->set_signal_mapping(signal_num, card_index);