diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-12 11:28:50 -0400 |
| commit | bb826f4beebfcedc50570b818c305560d2233e47 (patch) | |
| tree | 1484460f914e64fdbdce58230ffe7934bc0761f4 /gtk2_ardour/gain_meter.cc | |
| parent | 8c5cff60912c7e0a7256f635641399500d8d00d9 (diff) | |
| parent | f85b362351a5f9167f93b6988f2c8a4c7e03a33c (diff) | |
incomplete merge of master into windows (requires upcoming changes to master to be complete)
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index c2e4a43858..d4610da601 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -32,7 +32,6 @@ #include <gtkmm2ext/fastmeter.h> #include <gtkmm2ext/barcontroller.h> #include <gtkmm2ext/gtk_ui.h> -#include "midi++/manager.h" #include "pbd/fastlog.h" #include "pbd/stacktrace.h" @@ -280,14 +279,15 @@ GainMeterBase::setup_meters (int len) case Wide: meter_ticks1_area.show(); meter_ticks2_area.show(); + meter_metric_area.show(); if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { meter_width = 10; } break; case Narrow: - meter_width = 2; meter_ticks1_area.hide(); meter_ticks2_area.hide(); + meter_metric_area.hide(); break; } level_meter->setup_meters(len, meter_width); @@ -864,7 +864,7 @@ GainMeterBase::update_meters() } } -void GainMeterBase::color_handler(bool /* dpi */) +void GainMeterBase::color_handler(bool /*dpi*/) { setup_meters(); } |