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 /libs/ardour/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 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/meter.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/route.h | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 7ff910a91b..e7317f854f 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -93,7 +93,11 @@ public: private: friend class IO; - + + /** The number of meters that we are currently handling; + * may be different to _configured_input and _configured_output + * as it can be altered outside a ::configure_io by ::reflect_inputs. + */ ChanCount current_meters; std::vector<float> _peak_power; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 5a6fbd04b6..0bb9b69596 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -161,7 +161,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, void set_denormal_protection (bool yn); bool denormal_protection() const; - void set_meter_point (MeterPoint); + void set_meter_point (MeterPoint, bool force = false); void infer_meter_point () const; MeterPoint meter_point() const { return _meter_point; } void meter (); |