diff options
| author | Doug McLain <doug@nostar.net> | 2008-01-04 15:51:20 +0000 |
|---|---|---|
| committer | Doug McLain <doug@nostar.net> | 2008-01-04 15:51:20 +0000 |
| commit | f7a174a59b091ca545bffbd5b1d1bcaced95285f (patch) | |
| tree | 7be793584d53395261054ed2c7e15fd4469c81f6 /gtk2_ardour/gain_meter.cc | |
| parent | db1adb842a0daa1171a1927c2651b007e30ed5b4 (diff) | |
Create a better Narrow MixerStrip, and fix a bug where when enough routes are added, the meter draws right overtop of the fader belt
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2826 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 0953bd2aa2..82944a7bb1 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -141,18 +141,16 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s) hbox.set_spacing (2); hbox.pack_start (*fader_vbox, true, true); - set_width(Narrow); - Route* r; if ((r = dynamic_cast<Route*> (_io.get())) != 0) { - /* + /* if we have a non-hidden route (ie. we're not the click or the auditioner), pack some route-dependent stuff. */ - gain_display_box.pack_end (peak_display, true, true); + gain_display_box.pack_end (peak_display, true, true); hbox.pack_end (meter_packer, true, true); if (!r->hidden()) { @@ -215,15 +213,6 @@ GainMeter::GainMeter (boost::shared_ptr<IO> io, Session& s) void GainMeter::set_width (Width w, int len) { - switch (w) { - case Wide: - peak_display.show(); - break; - case Narrow: - peak_display.hide(); - break; - } - _width = w; setup_meters (len); } @@ -452,10 +441,8 @@ GainMeter::setup_meters (int len) /* pack them backwards */ - if (_width == Wide) { - meter_packer.pack_end (meter_metric_area, false, false); - meter_metric_area.show_all (); - } + meter_packer.pack_end (meter_metric_area, false, false); + meter_metric_area.show_all (); int b = ARDOUR_UI::config()->canvasvar_MeterColorBase.get(); int m = ARDOUR_UI::config()->canvasvar_MeterColorMid.get(); |