diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 18:32:28 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 18:38:44 -0400 |
commit | 96cc1dbe80f0378ca010c1c5ac37913958193360 (patch) | |
tree | fc89043007be602c33bf8752bc5461dc73d23349 /libs/ardour/ardour | |
parent | 202b9cc82a6d602ec842b60d609ebdcfe6bac16d (diff) |
Revert "add an Amp to Delivery, remove it from Send, make use of this in various ::run() methods"
This reverts commit 601a34521c2ce1d0167ed2f3c66f2fa6eeeb6b8e.
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/delivery.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/send.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 1b8ff3f87a..e19eef719f 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -34,7 +34,6 @@ class MuteMaster; class PannerShell; class Panner; class Pannable; -class Amp; class LIBARDOUR_API Delivery : public IOProcessor { @@ -68,8 +67,6 @@ public: bool set_name (const std::string& name); std::string display_name() const; - boost::shared_ptr<Amp> amp() const { return _amp; } - Role role() const { return _role; } bool can_support_io_configuration (const ChanCount& in, ChanCount& out); bool configure_io (ChanCount in, ChanCount out); @@ -109,8 +106,8 @@ public: protected: Role _role; BufferSet* _output_buffers; + gain_t _current_gain; boost::shared_ptr<PannerShell> _panshell; - boost::shared_ptr<Amp> _amp; gain_t target_gain (); diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index df9afad55c..17343bff96 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -43,6 +43,7 @@ class LIBARDOUR_API Send : public Delivery bool display_to_user() const; + boost::shared_ptr<Amp> amp() const { return _amp; } boost::shared_ptr<PeakMeter> meter() const { return _meter; } bool metering() const { return _metering; } @@ -77,6 +78,7 @@ class LIBARDOUR_API Send : public Delivery protected: bool _metering; + boost::shared_ptr<Amp> _amp; boost::shared_ptr<PeakMeter> _meter; boost::shared_ptr<DelayLine> _delayline; |