diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/automation_control.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/track.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/types.h | 3 |
3 files changed, 10 insertions, 9 deletions
diff --git a/libs/ardour/ardour/automation_control.h b/libs/ardour/ardour/automation_control.h index 9ad46c9090..2c15a1b1b0 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -38,9 +38,9 @@ class AutomationControl : public PBD::Controllable, public Evoral::Control { public: AutomationControl(ARDOUR::Session&, - const Evoral::Parameter& parameter, - boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(), - const std::string& name=""); + const Evoral::Parameter& parameter, + boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(), + const std::string& name=""); boost::shared_ptr<AutomationList> alist() const { return boost::dynamic_pointer_cast<AutomationList>(_list); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 587a8dcd1b..2ec1ed4fdd 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -102,7 +102,7 @@ class Track : public Route, public PublicDiskstream virtual int set_state (const XMLNode&, int version); static void zero_diskstream_id_in_xml (XMLNode&); - boost::shared_ptr<PBD::Controllable> rec_enable_control() { return _rec_enable_control; } + boost::shared_ptr<AutomationControl> rec_enable_control() { return _rec_enable_control; } bool record_enabled() const; void set_record_enabled (bool yn, void *src); @@ -201,13 +201,13 @@ class Track : public Route, public PublicDiskstream FreezeState state; }; - struct RecEnableControllable : public PBD::Controllable { - RecEnableControllable (Track&); + struct RecEnableControl : public AutomationControl { + RecEnableControl (boost::shared_ptr<Track> t); void set_value (double); double get_value (void) const; - Track& track; + boost::shared_ptr<Track> track; }; virtual void set_state_part_two () = 0; @@ -218,7 +218,7 @@ class Track : public Route, public PublicDiskstream void maybe_declick (BufferSet&, framecnt_t, int); - boost::shared_ptr<RecEnableControllable> _rec_enable_control; + boost::shared_ptr<RecEnableControl> _rec_enable_control; framecnt_t check_initial_delay (framecnt_t nframes, framecnt_t&); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index b6ab07c743..3ebf5478e6 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -145,7 +145,8 @@ namespace ARDOUR { MidiSystemExclusiveAutomation, FadeInAutomation, FadeOutAutomation, - EnvelopeAutomation + EnvelopeAutomation, + RecEnableAutomation }; enum AutoState { |