diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-25 11:47:21 -0500 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-01-25 11:47:21 -0500 |
commit | 22a20c7333a14ac0c4af20287d8643e07ff92903 (patch) | |
tree | 946191642602a879af20b137b0bc00e8af693022 /libs/ardour/ardour | |
parent | 452e39f8a30a2cd435049922a13150b55f51ac0d (diff) |
change exposed type of various objects' gain controls; remove Amp::gain() as a shortcut
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/amp.h | 11 | ||||
-rw-r--r-- | libs/ardour/ardour/return.h | 5 | ||||
-rw-r--r-- | libs/ardour/ardour/route.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/send.h | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index 673ec2e3c3..20a07c092a 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -37,7 +37,7 @@ class IO; */ class LIBARDOUR_API Amp : public Processor { public: - Amp(Session& s, const std::string& display_name, boost::shared_ptr<AutomationControl> control, bool control_midi_also); + Amp(Session& s, const std::string& display_name, boost::shared_ptr<GainControl> control, bool control_midi_also); std::string display_name () const { return _display_name; } void set_display_name (const std::string& name) { _display_name = name; } @@ -69,16 +69,13 @@ public: static void apply_simple_gain(AudioBuffer& buf, framecnt_t nframes, gain_t target); static void declick (BufferSet& bufs, framecnt_t nframes, int dir); - - gain_t gain () const { return _gain_control->get_value(); } - static void update_meters(); - boost::shared_ptr<AutomationControl> gain_control() { + boost::shared_ptr<GainControl> gain_control() { return _gain_control; } - boost::shared_ptr<const AutomationControl> gain_control() const { + boost::shared_ptr<const GainControl> gain_control() const { return _gain_control; } @@ -93,7 +90,7 @@ private: std::string _display_name; - boost::shared_ptr<AutomationControl> _gain_control; + boost::shared_ptr<GainControl> _gain_control; /** Buffer that we should use for gain automation */ gain_t* _gain_automation_buffer; diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h index e2e326d7d0..1d60a43d38 100644 --- a/libs/ardour/ardour/return.h +++ b/libs/ardour/ardour/return.h @@ -32,7 +32,7 @@ namespace ARDOUR { class Amp; class PeakMeter; - +class GainControl; class LIBARDOUR_API Return : public IOProcessor { @@ -46,6 +46,7 @@ public: boost::shared_ptr<Amp> amp() const { return _amp; } boost::shared_ptr<PeakMeter> meter() const { return _meter; } + boost::shared_ptr<GainControl> gain_control() const { return _gain_control; } bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } @@ -64,7 +65,7 @@ public: protected: bool _metering; - boost::shared_ptr<AutomationControl> _gain_control; + boost::shared_ptr<GainControl> _gain_control; boost::shared_ptr<Amp> _amp; boost::shared_ptr<PeakMeter> _meter; diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 5351d8490a..6bc8869d92 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -495,9 +495,9 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou boost::shared_ptr<Panner> panner() const; /* may return null */ boost::shared_ptr<PannerShell> panner_shell() const; - boost::shared_ptr<AutomationControl> gain_control() const; + boost::shared_ptr<GainControl> gain_control() const; boost::shared_ptr<Pannable> pannable() const; - boost::shared_ptr<AutomationControl> trim_control() const; + boost::shared_ptr<GainControl> trim_control() const; /** Return the first processor that accepts has at least one MIDI input diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index 5db0b94b87..3b0e8a4309 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -32,6 +32,7 @@ namespace ARDOUR { class PeakMeter; class Amp; +class GainControl; class LIBARDOUR_API Send : public Delivery { @@ -45,6 +46,7 @@ class LIBARDOUR_API Send : public Delivery boost::shared_ptr<Amp> amp() const { return _amp; } boost::shared_ptr<PeakMeter> meter() const { return _meter; } + boost::shared_ptr<GainControl> gain_control() const { return _gain_control; } bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } @@ -78,7 +80,7 @@ class LIBARDOUR_API Send : public Delivery protected: bool _metering; - boost::shared_ptr<AutomationControl> _gain_control; + boost::shared_ptr<GainControl> _gain_control; boost::shared_ptr<Amp> _amp; boost::shared_ptr<PeakMeter> _meter; boost::shared_ptr<DelayLine> _delayline; |