diff options
| author | Carl Hetherington <carl@carlh.net> | 2011-01-09 15:10:59 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2011-01-09 15:10:59 +0000 |
| commit | 173a8894e370eb4494d3dd996abb61b22913b466 (patch) | |
| tree | 71a32e7915ad5479a7447655c914efe4250ec050 /gtk2_ardour | |
| parent | ddb1a76e5b1b0645d28a83f4735f2070b204fc38 (diff) | |
Fix setup of route meter point on load, and fix intermittent left-channel-only metering (#3699).
git-svn-id: svn://localhost/ardour2/branches/3.0@8486 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 10 | ||||
| -rw-r--r-- | gtk2_ardour/gain_meter.h | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 571f140bac..7dd7f88d7c 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -530,7 +530,7 @@ GainMeterBase::meter_press(GdkEventButton* ev) */ if (ev->button == 1) { - set_mix_group_meter_point (*_route, next_meter_point (_route->meter_point())); + set_route_group_meter_point (*_route, next_meter_point (_route->meter_point())); } } else { @@ -572,12 +572,12 @@ GainMeterBase::set_meter_point (Route& route, MeterPoint mp) } void -GainMeterBase::set_mix_group_meter_point (Route& route, MeterPoint mp) +GainMeterBase::set_route_group_meter_point (Route& route, MeterPoint mp) { - RouteGroup* mix_group; + RouteGroup* route_group; - if((mix_group = route.route_group()) != 0){ - mix_group->foreach_route (boost::bind (&Route::set_meter_point, _1, mp)); + if ((route_group = route.route_group ()) != 0) { + route_group->foreach_route (boost::bind (&Route::set_meter_point, _1, mp, false)); } else { route.set_meter_point (mp); } diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index 2c481837ae..600f7c2c00 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -158,7 +158,7 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr gint start_gain_touch (GdkEventButton*); gint end_gain_touch (GdkEventButton*); - void set_mix_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint); + void set_route_group_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint); void set_meter_point (ARDOUR::Route&, ARDOUR::MeterPoint); gint meter_release (GdkEventButton*); gint meter_press (GdkEventButton*); |