professionalize peak-meters

[ardour.git] / libs / ardour / ardour / route.h

diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h
index 5d52fc0c52493e5436f87b34843bd520bdb01aa4..fbce3fd3f38cbc9b247cfb7bd06c4d8a1767c557 100644 (file)
--- a/libs/ardour/ardour/route.h
+++ b/libs/ardour/ardour/route.h
@@ -142,6 +142,9 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        void set_gain (gain_t val, void *src);
        void inc_gain (gain_t delta, void *src);
 
+       void set_trim (gain_t val, void *src);
+       void inc_trim (gain_t delta, void *src);
+
        void set_mute_points (MuteMaster::MutePoint);
        MuteMaster::MutePoint mute_points () const;
 
@@ -179,8 +182,9 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        bool denormal_protection() const;
 
        void         set_meter_point (MeterPoint, bool force = false);
-       MeterPoint   meter_point() const { return _meter_point; }
-       void         meter ();
+       bool         apply_processor_changes_rt ();
+       void         emit_pending_signals ();
+       MeterPoint   meter_point() const { return _pending_meter_point; }
 
        void         set_meter_type (MeterType t) { _meter_type = t; }
        MeterType    meter_type() const { return _meter_type; }
@@ -188,6 +192,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        /* Processors */
 
        boost::shared_ptr<Amp> amp() const  { return _amp; }
+       boost::shared_ptr<Amp> trim() const { return _trim; }
        PeakMeter&       peak_meter()       { return *_meter.get(); }
        const PeakMeter& peak_meter() const { return *_meter.get(); }
        boost::shared_ptr<PeakMeter> shared_peak_meter() const { return _meter; }
@@ -255,6 +260,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        int add_processors (const ProcessorList&, boost::shared_ptr<Processor>, ProcessorStreams* err = 0);
        boost::shared_ptr<Processor> before_processor_for_placement (Placement);
        boost::shared_ptr<Processor> before_processor_for_index (int);
+       bool processors_reorder_needs_configure (const ProcessorList& new_order);
        int remove_processor (boost::shared_ptr<Processor>, ProcessorStreams* err = 0, bool need_process_lock = true);
        int remove_processors (const ProcessorList&, ProcessorStreams* err = 0);
        int reorder_processors (const ProcessorList& new_order, ProcessorStreams* err = 0);
@@ -504,6 +510,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        bool           _active;
        framecnt_t     _signal_latency;
        framecnt_t     _signal_latency_at_amp_position;
+       framecnt_t     _signal_latency_at_trim_position;
        framecnt_t     _initial_delay;
        framecnt_t     _roll_delay;
 
@@ -515,9 +522,21 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        boost::shared_ptr<MonitorProcessor> _monitor_control;
        boost::shared_ptr<Pannable> _pannable;
 
+       enum {
+               EmitNone = 0x00,
+               EmitMeterChanged = 0x01,
+               EmitMeterVisibilityChange = 0x02,
+               EmitRtProcessorChange = 0x04
+       };
+
+       ProcessorList  _pending_processor_order;
+       gint           _pending_process_reorder; // atomic
+       gint           _pending_signals; // atomic
+
        Flag           _flags;
        int            _pending_declick;
        MeterPoint     _meter_point;
+       MeterPoint     _pending_meter_point;
        MeterType      _meter_type;
        boost::dynamic_bitset<> _phase_invert;
        bool           _self_solo;
@@ -567,6 +586,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        virtual void maybe_declick (BufferSet&, framecnt_t, int);
 
        boost::shared_ptr<Amp>       _amp;
+       boost::shared_ptr<Amp>       _trim;
        boost::shared_ptr<PeakMeter> _meter;
        boost::shared_ptr<DelayLine> _delayline;
 
@@ -592,6 +612,9 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
        bool _initial_io_setup;
 
        int configure_processors_unlocked (ProcessorStreams*);
+       bool set_meter_point_unlocked ();
+       void apply_processor_order (const ProcessorList& new_order);
+
        std::list<std::pair<ChanCount, ChanCount> > try_configure_processors (ChanCount, ProcessorStreams *);
        std::list<std::pair<ChanCount, ChanCount> > try_configure_processors_unlocked (ChanCount, ProcessorStreams *);
 
@@ -648,8 +671,6 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou
            or 0.
        */
        boost::weak_ptr<Processor> _processor_after_last_custom_meter;
-       /** true if the last custom meter position was at the end of the processor list */
-       bool _last_custom_meter_was_at_end;
 
         void reset_instrument_info ();