diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-14 16:42:40 -0400 |
| commit | 7a30e63eaad66ded1c47f5cdb2e0f28c3b0a1d4a (patch) | |
| tree | 25e1b01865e76193f3c88483d4f9de1c8abf2f9d /gtk2_ardour/gain_meter.cc | |
| parent | e6521bb0434d88802aa28e75235bc8c19ebb9262 (diff) | |
| parent | f5191e62578bd2ba2b3e2adf8cfc3634aa4b929c (diff) | |
fix merge conflicts with master
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index b7b53a64bf..edf07a13a5 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" @@ -278,16 +277,20 @@ GainMeterBase::setup_meters (int len) switch (_width) { case Wide: - meter_ticks1_area.show(); - meter_ticks2_area.show(); + //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(); + if (_route && _route->shared_peak_meter()->input_streams().n_total() > 1) { + meter_width = 4; + } + //meter_ticks1_area.hide(); + //meter_ticks2_area.hide(); + meter_metric_area.hide(); break; } level_meter->setup_meters(len, meter_width); |