From 5de0aee2874133dd428640d2e78ae231f3fdd0a8 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sun, 7 Jul 2013 14:39:26 +0200 Subject: share meter-type among meter instances. --- libs/ardour/ardour/route.h | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'libs/ardour/ardour/route.h') 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; -- cgit v1.2.3