diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-07 14:39:26 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:13 +0200 |
| commit | 5de0aee2874133dd428640d2e78ae231f3fdd0a8 (patch) | |
| tree | fb6774dc88f9222008d50d55353ed99a9fbe0544 /libs/ardour | |
| parent | 58b325de319ab1d807511783f55a7fe3748e8614 (diff) | |
share meter-type among meter instances.
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 9 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 14 |
2 files changed, 7 insertions, 16 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 783011a158..2e44d00984 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -181,10 +181,8 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, MeterPoint meter_point() const { return _meter_point; } void meter (); - void set_meter_type_mixer (MeterType t) { _meter_type_mixer = t; } - void set_meter_type_meterbridge (MeterType t) { _meter_type_meterbridge = t; } - MeterType meter_type_mixer() const { return _meter_type_mixer; } - MeterType meter_type_meterbridge() const { return _meter_type_meterbridge; } + void set_meter_type (MeterType t) { _meter_type = t; } + MeterType meter_type() const { return _meter_type; } /* Processors */ @@ -491,8 +489,7 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, Flag _flags; int _pending_declick; MeterPoint _meter_point; - MeterType _meter_type_mixer; - MeterType _meter_type_meterbridge; + MeterType _meter_type; boost::dynamic_bitset<> _phase_invert; bool _self_solo; uint32_t _soloed_by_others_upstream; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index d3e0fbce22..e87cb4b03f 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -83,8 +83,7 @@ Route::Route (Session& sess, string name, Flag flg, DataType default_type) , _flags (flg) , _pending_declick (true) , _meter_point (MeterPostFader) - , _meter_type_mixer (MeterPeak) - , _meter_type_meterbridge (MeterPeak) + , _meter_type (MeterPeak) , _self_solo (false) , _soloed_by_others_upstream (0) , _soloed_by_others_downstream (0) @@ -1880,8 +1879,7 @@ Route::state(bool full_state) node->add_property("denormal-protection", _denormal_protection?"yes":"no"); node->add_property("meter-point", enum_2_string (_meter_point)); - node->add_property("meter-type-mixer", enum_2_string (_meter_type_mixer)); - node->add_property("meter-type-meterbridge", enum_2_string (_meter_type_meterbridge)); + node->add_property("meter-type", enum_2_string (_meter_type)); if (_route_group) { node->add_property("route-group", _route_group->name()); @@ -2057,12 +2055,8 @@ Route::set_state (const XMLNode& node, int version) } } - if ((prop = node.property (X_("meter-type-mixer"))) != 0) { - _meter_type_mixer = MeterType (string_2_enum (prop->value (), _meter_type_mixer)); - } - - if ((prop = node.property (X_("meter-type-meterbridge"))) != 0) { - _meter_type_meterbridge = MeterType (string_2_enum (prop->value (), _meter_type_meterbridge)); + if ((prop = node.property (X_("meter-type"))) != 0) { + _meter_type = MeterType (string_2_enum (prop->value (), _meter_type)); } set_processor_state (processor_state); |