Fix the channel names in the analyzer.

diff --git a/analyzer.cpp b/analyzer.cpp
index 7e1b4c6971a215edf1bc284f8415b58a7d0b4630..e61e4885b57631dbc99400cff4c64f1f536b2809 100644 (file)
--- a/analyzer.cpp
+++ b/analyzer.cpp
@@ -75,6 +75,14 @@ Analyzer::~Analyzer()
        delete surface;
 }
 
+void Analyzer::update_channel_name(Mixer::Output output, const string &name)
+{
+       if (output >= Mixer::OUTPUT_INPUT0) {
+               int index = (output - Mixer::OUTPUT_INPUT0) + 2;
+               ui->input_box->setItemText(index, QString::fromStdString(name));
+       }
+}
+
 void Analyzer::mixer_shutting_down()
 {
        ui->display->shutdown();

diff --git a/analyzer.h b/analyzer.h
index d9bd8b8052348cf416020474e8876b5b94895f86..71c061288a97106fe615a4cb06c0193eca9a5ed0 100644 (file)
--- a/analyzer.h
+++ b/analyzer.h
@@ -5,8 +5,12 @@
 #include <QMainWindow>
 #include <QString>
 
+#include <string>
+
 #include <epoxy/gl.h>
 
+#include "mixer.h"
+
 class QObject;
 class QOpenGLContext;
 class QSurface;
@@ -26,6 +30,7 @@ class Analyzer : public QMainWindow
 public:
        Analyzer();
        ~Analyzer();
+       void update_channel_name(Mixer::Output output, const std::string &name);
        void mixer_shutting_down();
 
 public slots:

diff --git a/mainwindow.cpp b/mainwindow.cpp
index fedd18086157c39421f89d33f4bd882a600dfbe3..537f8810acad38c26d4fdba0e3d3a2e60a08358a 100644 (file)
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1254,6 +1254,8 @@ void MainWindow::update_channel_name(Mixer::Output output, const string &name)
                unsigned channel = output - Mixer::OUTPUT_INPUT0;
                previews[channel]->label->setText(name.c_str());
        }
+
+       analyzer->update_channel_name(output, name);
 }
 
 void MainWindow::update_channel_color(Mixer::Output output, const string &color)