From 5ac22e9095d5f851b5238029e3f813bc86fe2280 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 16 Jun 2012 17:20:10 +0000 Subject: Add new SharedStatefulProperty which manages a shared_ptr to some Stateful object, and a subclass to use this for AutomationList. SharedStatefulProperty will manage undo / redo using full copies of the XML state, like MementoCommand, but does it within the Property undo system. git-svn-id: svn://localhost/ardour2/branches/3.0@12740 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/audioregion.h | 41 ++++++++++++++++-------------------- libs/ardour/ardour/automation_list.h | 25 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 23 deletions(-) (limited to 'libs/ardour/ardour') diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 5fdc0ac041..e38c98ea05 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -46,16 +46,11 @@ namespace Properties { extern PBD::PropertyDescriptor fade_in_active; extern PBD::PropertyDescriptor fade_out_active; extern PBD::PropertyDescriptor scale_amplitude; - - /* the envelope and fades are not scalar items and so - currently (2010/02) are not stored using Property. - However, these descriptors enable us to notify - about changes to them via PropertyChange. - */ - - extern PBD::PropertyDescriptor envelope; - extern PBD::PropertyDescriptor fade_in; - extern PBD::PropertyDescriptor fade_out; + extern PBD::PropertyDescriptor > fade_in; + extern PBD::PropertyDescriptor > inverse_fade_in; + extern PBD::PropertyDescriptor > fade_out; + extern PBD::PropertyDescriptor > inverse_fade_out; + extern PBD::PropertyDescriptor > envelope; } class Playlist; @@ -99,11 +94,11 @@ class AudioRegion : public Region bool fade_out_is_short() const { return _fade_out_is_short; } void set_fade_out_is_short (bool yn); - boost::shared_ptr fade_in() { return _fade_in; } - boost::shared_ptr inverse_fade_in() { return _inverse_fade_in; } - boost::shared_ptr fade_out() { return _fade_out; } - boost::shared_ptr inverse_fade_out() { return _inverse_fade_out; } - boost::shared_ptr envelope() { return _envelope; } + boost::shared_ptr fade_in() { return _fade_in.val (); } + boost::shared_ptr inverse_fade_in() { return _inverse_fade_in.val (); } + boost::shared_ptr fade_out() { return _fade_out.val (); } + boost::shared_ptr inverse_fade_out() { return _inverse_fade_out.val (); } + boost::shared_ptr envelope() { return _envelope.val (); } Evoral::Range body_range () const; @@ -231,15 +226,15 @@ class AudioRegion : public Region void connect_to_analysis_changed (); void connect_to_header_position_offset_changed (); - Automatable _automatable; - boost::shared_ptr _fade_in; - boost::shared_ptr _inverse_fade_in; - boost::shared_ptr _fade_out; - boost::shared_ptr _inverse_fade_out; - boost::shared_ptr _envelope; - uint32_t _fade_in_suspended; - uint32_t _fade_out_suspended; + AutomationListProperty _fade_in; + AutomationListProperty _inverse_fade_in; + AutomationListProperty _fade_out; + AutomationListProperty _inverse_fade_out; + AutomationListProperty _envelope; + Automatable _automatable; + uint32_t _fade_in_suspended; + uint32_t _fade_out_suspended; boost::shared_ptr get_single_other_xfade_region (bool start) const; diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 58d1fe4acf..01c9d0641a 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -29,6 +29,7 @@ #include "pbd/undo.h" #include "pbd/xml++.h" #include "pbd/statefuldestructible.h" +#include "pbd/properties.h" #include "ardour/ardour.h" @@ -36,6 +37,28 @@ namespace ARDOUR { +class AutomationList; + +/** A SharedStatefulProperty for AutomationLists */ +class AutomationListProperty : public PBD::SharedStatefulProperty +{ +public: + AutomationListProperty (PBD::PropertyDescriptor > d, Ptr p) + : PBD::SharedStatefulProperty (d.property_id, p) + {} + + AutomationListProperty (PBD::PropertyDescriptor > d, Ptr o, Ptr c) + : PBD::SharedStatefulProperty (d.property_id, o, c) + {} + + PBD::PropertyBase* clone () const; + +private: + /* No copy-construction nor assignment */ + AutomationListProperty (AutomationListProperty const &); + AutomationListProperty& operator= (AutomationListProperty const &); +}; + class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlList { public: @@ -82,6 +105,8 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL XMLNode& state (bool full); XMLNode& serialize_events (); + bool operator!= (const AutomationList &) const; + private: void create_curve_if_necessary (); int deserialize_events (const XMLNode&); -- cgit v1.2.3