From 56ebeafc49f5e8786adde7365cce2249ae7980f4 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Sat, 13 May 2017 11:03:16 +0200 Subject: [PATCH] Fix the channel names in the analyzer. --- analyzer.cpp | 8 ++++++++ analyzer.h | 5 +++++ mainwindow.cpp | 2 ++ 3 files changed, 15 insertions(+) diff --git a/analyzer.cpp b/analyzer.cpp index 7e1b4c6..e61e488 100644 --- 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 d9bd8b8..71c0612 100644 --- a/analyzer.h +++ b/analyzer.h @@ -5,8 +5,12 @@ #include #include +#include + #include +#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 fedd180..537f881 100644 --- 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) -- 2.39.2