diff options
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 14 |
1 files changed, 4 insertions, 10 deletions
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); |