diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-07 06:17:02 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:13 +0200 |
| commit | 3a8f5a9770c61a8546bec905301be3ea0b038c86 (patch) | |
| tree | e811d4dc8dace482a1ecba5e249b27c06fdd9cff /libs/ardour | |
| parent | 4368759d41ffddf1c57baeb3c2bc929ab600b79b (diff) | |
remember meter type with session
Diffstat (limited to 'libs/ardour')
| -rw-r--r-- | libs/ardour/ardour/route.h | 7 | ||||
| -rw-r--r-- | libs/ardour/meter.cc | 2 | ||||
| -rw-r--r-- | libs/ardour/route.cc | 13 |
3 files changed, 21 insertions, 1 deletions
diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 0bd3b07ea4..783011a158 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -181,6 +181,11 @@ 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; } + /* Processors */ boost::shared_ptr<Amp> amp() const { return _amp; } @@ -486,6 +491,8 @@ class Route : public SessionObject, public Automatable, public RouteGroupMember, Flag _flags; int _pending_declick; MeterPoint _meter_point; + MeterType _meter_type_mixer; + MeterType _meter_type_meterbridge; boost::dynamic_bitset<> _phase_invert; bool _self_solo; uint32_t _soloed_by_others_upstream; diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index ccb3ff32d0..0773ab451a 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -95,7 +95,7 @@ PeakMeter::run (BufferSet& bufs, framepos_t /*start_frame*/, framepos_t /*end_fr // Meter audio in to the rest of the peaks for (uint32_t i = 0; i < n_audio; ++i, ++n) { _peak_signal[n] = compute_peak (bufs.get_audio(i).data(), nframes, _peak_signal[n]); - if (_meter_type & MeterKrms) { + if (1 /* TODO use separate bit-flags for mixer|meterbridge */ || _meter_type & MeterKrms) { _kmeter[i]->process(bufs.get_audio(i).data(), nframes); } } diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index b9c6f1b4cd..d3e0fbce22 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -83,6 +83,8 @@ 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) , _self_solo (false) , _soloed_by_others_upstream (0) , _soloed_by_others_downstream (0) @@ -1878,6 +1880,9 @@ 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)); + if (_route_group) { node->add_property("route-group", _route_group->name()); } @@ -2052,6 +2057,14 @@ 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)); + } + set_processor_state (processor_state); // this looks up the internal instrument in processors |