Rewrite the ALSA sequencer input loop.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index f8e76c771402e6688e9be75e601a3f08c8230894..9d5e02cd3c72e86207298042c155a092e5599d8f 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -14,6 +14,7 @@
 
 #include <stdio.h>
 #include <functional>
+#include <limits>
 #include <mutex>
 #include <movit/effect_chain.h>
 #include <movit/resource_pool.h>
@@ -53,17 +54,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);
-               emit color_updated(output);
        });
-
+       if (output == Mixer::OUTPUT_LIVE) {
+               global_mixer->set_transition_names_updated_callback(output, [this](const vector<string> &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);
@@ -182,7 +192,7 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
        // The same for resolution.
        QMenu mode_submenu;
        QActionGroup mode_group(&mode_submenu);
-       std::map<uint32_t, VideoMode> video_modes = global_mixer->get_available_video_modes(current_card);
+       std::map<uint32_t, bmusb::VideoMode> 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) {
@@ -215,13 +225,16 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
        // --- 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);
        }
-       menu.addAction(audio_source_action);
 
        // And a master clock selector.
        QAction *master_clock_action = new QAction("Use as master clock", &menu);
@@ -234,8 +247,8 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
 
        // 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) {