diff options
| -rw-r--r-- | libs/ardour/ardour/delivery.h | 13 | ||||
| -rw-r--r-- | libs/ardour/delivery.cc | 12 |
2 files changed, 14 insertions, 11 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index e74d0cc524..743854027d 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -107,19 +107,22 @@ public: Role _role; BufferSet* _output_buffers; gain_t _current_gain; - bool _no_outs_cuz_we_no_monitor; - boost::shared_ptr<MuteMaster> _mute_master; - bool no_panner_reset; boost::shared_ptr<PannerShell> _panshell; + gain_t target_gain (); + + private: + bool _no_outs_cuz_we_no_monitor; + boost::shared_ptr<MuteMaster> _mute_master; + static bool panners_legal; - static PBD::Signal0<int> PannersLegal; + static PBD::Signal0<int> PannersLegal; int panners_became_legal (); PBD::ScopedConnection panner_legal_c; void output_changed (IOChange, void*); - gain_t target_gain (); + bool _no_panner_reset; }; diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 9847042801..f9ff3be83e 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -61,7 +61,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann , _current_gain (1.0) , _no_outs_cuz_we_no_monitor (false) , _mute_master (mm) - , no_panner_reset (false) + , _no_panner_reset (false) { if (pannable) { _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable)); @@ -85,7 +85,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha , _current_gain (1.0) , _no_outs_cuz_we_no_monitor (false) , _mute_master (mm) - , no_panner_reset (false) + , _no_panner_reset (false) { if (pannable) { _panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable)); @@ -387,7 +387,7 @@ void Delivery::reset_panner () { if (panners_legal) { - if (!no_panner_reset) { + if (!_no_panner_reset) { if (_panshell) { _panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs())); @@ -422,19 +422,19 @@ Delivery::panners_became_legal () void Delivery::defer_pan_reset () { - no_panner_reset = true; + _no_panner_reset = true; } void Delivery::allow_pan_reset () { - no_panner_reset = false; + _no_panner_reset = false; reset_panner (); } int -Delivery::disable_panners (void) +Delivery::disable_panners () { panners_legal = false; return 0; |