From 5fca8c98545b699a9bce0446436d1107c4ed55a1 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Thu, 25 Jul 2013 10:59:24 +0200 Subject: [PATCH] Don't allow to deactivate meter. before this change: 1) switch to 'custom' meter point, 2) deactivate meter processor. -> meters does not run regardless of meter-point -> meter can only be re-nabled in 'custom' mode --- libs/ardour/ardour/meter.h | 3 +++ libs/ardour/meter.cc | 2 ++ 2 files changed, 5 insertions(+) diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 4ac140fd04..a4ad8ecff4 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -75,6 +75,9 @@ public: /** Compute peaks */ void run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool); + void activate () { } + void deactivate () { } + ChanCount input_streams () const { return current_meters; } ChanCount output_streams () const { return current_meters; } diff --git a/libs/ardour/meter.cc b/libs/ardour/meter.cc index 0c23ea168d..26e865bec3 100644 --- a/libs/ardour/meter.cc +++ b/libs/ardour/meter.cc @@ -43,6 +43,8 @@ PeakMeter::PeakMeter (Session& s, const std::string& name) Iec1ppmdsp::init(s.nominal_frame_rate()); Iec2ppmdsp::init(s.nominal_frame_rate()); Vumeterdsp::init(s.nominal_frame_rate()); + _pending_active = true; + _active = true; } PeakMeter::~PeakMeter ()