Fix a memory leak in interleaving.

[nageru] / glwidget.cpp

diff --git a/glwidget.cpp b/glwidget.cpp
index e8c241669a9fab11e66185a0446b2b3f1628198e..82d702fa1947c85f2ff9f742dbfa50216dc624a4 100644 (file)
--- a/glwidget.cpp
+++ b/glwidget.cpp
@@ -58,11 +58,20 @@ void GLWidget::initializeGL()
        });
        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<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);
@@ -211,6 +220,7 @@ 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);
@@ -221,10 +231,21 @@ void GLWidget::show_context_menu(unsigned signal_num, const QPoint &pos)
        }
        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(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);
+       } else if (selected_item == master_clock_action) {
+               global_mixer->set_master_clock(signal_num);
        } else if (selected_item != nullptr) {
                QList<QVariant> selected = selected_item->data().toList();
                if (selected[0].toString() == "video_mode") {