X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=mainwindow.cpp;h=36ea55ee3f8883fbe4e97fa484570bc26e70e8ee;hb=5cd2e667b7531777991c98dc6d3249e95b98314c;hp=eb78d0e545dc73c817c50d8bc762bb579ceee82a;hpb=7c1bb8357495778076a47636c2c4192674034165;p=nageru

diff --git a/mainwindow.cpp b/mainwindow.cpp
index eb78d0e..36ea55e 100644
--- a/mainwindow.cpp
+++ b/mainwindow.cpp
@@ -1,42 +1,70 @@
 #include "mainwindow.h"
 
-#include <math.h>
-#include <stdio.h>
+#include <assert.h>
 #include <signal.h>
-#include <algorithm>
-#include <chrono>
-#include <string>
-#include <vector>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <QAbstractButton>
+#include <QAbstractSlider>
+#include <QAction>
+#include <QActionGroup>
+#include <QApplication>
 #include <QBoxLayout>
+#include <QCheckBox>
+#include <QDial>
+#include <QDialog>
+#include <QEvent>
+#include <QFlags>
+#include <QFrame>
+#include <QImage>
 #include <QInputDialog>
 #include <QKeySequence>
 #include <QLabel>
+#include <QLayoutItem>
+#include <QMenuBar>
 #include <QMessageBox>
-#include <QMetaType>
+#include <QMouseEvent>
+#include <QObject>
 #include <QPushButton>
-#include <QResizeEvent>
+#include <QRect>
+#include <QRgb>
 #include <QShortcut>
-#include <QSize>
-#include <QString>
+#include <QStackedWidget>
+#include <QToolButton>
+#include <QWidget>
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <functional>
+#include <limits>
+#include <memory>
+#include <ratio>
+#include <string>
+#include <vector>
 
 #include "aboutdialog.h"
+#include "alsa_pool.h"
+#include "clickable_label.h"
+#include "correlation_meter.h"
 #include "disk_space_estimator.h"
+#include "ellipsis_label.h"
 #include "flags.h"
 #include "glwidget.h"
+#include "input_mapping.h"
 #include "input_mapping_dialog.h"
 #include "lrameter.h"
 #include "midi_mapping.pb.h"
 #include "midi_mapping_dialog.h"
 #include "mixer.h"
+#include "nonlinear_fader.h"
 #include "post_to_main_thread.h"
-#include "ui_audio_miniview.h"
 #include "ui_audio_expanded_view.h"
+#include "ui_audio_miniview.h"
 #include "ui_display.h"
 #include "ui_mainwindow.h"
 #include "vumeter.h"
 
-class QResizeEvent;
-
 using namespace std;
 using namespace std::chrono;
 using namespace std::placeholders;
@@ -221,6 +249,8 @@ MainWindow::MainWindow()
 		}
 		midi_mapper.set_midi_mapping(midi_mapping);
 	}
+	midi_mapper.refresh_highlights();
+	midi_mapper.refresh_lights();
 	midi_mapper.start_thread();
 }
 
@@ -499,13 +529,6 @@ void MainWindow::setup_audio_expanded_view()
 				global_audio_mixer->reset_peak(bus_index);
 				midi_mapper.refresh_lights();
 			});
-
-		// Set up the compression attenuation meter.
-		VUMeter *reduction_meter = ui_audio_expanded_view->reduction_meter;
-		reduction_meter->set_min_level(0.0f);
-		reduction_meter->set_max_level(10.0f);
-		reduction_meter->set_ref_level(0.0f);
-		reduction_meter->set_flip(true);
 	}
 
 	update_cutoff_labels(global_audio_mixer->get_locut_cutoff());
@@ -787,7 +810,7 @@ void MainWindow::audio_level_callback(float level_lufs, float peak_db, vector<Au
 					level.current_level_dbfs[0], level.current_level_dbfs[1]);
 				view->peak_meter->set_peak(
 					level.peak_level_dbfs[0], level.peak_level_dbfs[1]);
-				view->reduction_meter->set_level(level.compressor_attenuation_db);
+				view->reduction_meter->set_reduction_db(level.compressor_attenuation_db);
 				view->gainstaging_knob->blockSignals(true);
 				view->gainstaging_knob->setValue(lrintf(level.gain_staging_db * 10.0f));
 				view->gainstaging_knob->blockSignals(false);