diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-26 01:24:01 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-05-26 01:24:01 +0000 |
| commit | e3f73f265511cb6890e646094956da8c438e3505 (patch) | |
| tree | a3ebbb5f7d0902ca7c7dcc027856cefef8698dab /libs/ardour/ardour/audioregion.h | |
| parent | 2d017301f99a42dcbff4239b8767c0e14331ff77 (diff) | |
convert audioregion xfade stuff to properties, add "is-short" property for fade in and out so that we can keep track of whether an (x)fade is supposed to remain "short", and don't do "mess-with-region-below" stuff when trimming a short xfade. should be back-compatible with 3beta4a
git-svn-id: svn://localhost/ardour2/branches/3.0@12452 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index c03f32cb63..0d83b33539 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -94,6 +94,11 @@ class AudioRegion : public Region bool fade_out_is_xfade() const { return _fade_out_is_xfade; } void set_fade_out_is_xfade (bool yn); + bool fade_in_is_short() const { return _fade_in_is_short; } + void set_fade_in_is_short (bool yn); + bool fade_out_is_short() const { return _fade_out_is_short; } + void set_fade_out_is_short (bool yn); + boost::shared_ptr<AutomationList> fade_in() { return _fade_in; } boost::shared_ptr<AutomationList> inverse_fade_in() { return _inverse_fade_in; } boost::shared_ptr<AutomationList> fade_out() { return _fade_out; } @@ -199,6 +204,10 @@ class AudioRegion : public Region PBD::Property<bool> _fade_out_active; /** linear gain to apply to the whole region */ PBD::Property<gain_t> _scale_amplitude; + PBD::Property<bool> _fade_in_is_xfade; + PBD::Property<bool> _fade_out_is_xfade; + PBD::Property<bool> _fade_in_is_short; + PBD::Property<bool> _fade_out_is_short; void register_properties (); void post_set (const PBD::PropertyChange&); @@ -231,11 +240,6 @@ class AudioRegion : public Region boost::shared_ptr<AutomationList> _envelope; uint32_t _fade_in_suspended; uint32_t _fade_out_suspended; - /* This is not a Property because its not subject to user control, - or undo/redo. XXX this may prove to be a mistake. - */ - bool _fade_in_is_xfade; - bool _fade_out_is_xfade; boost::shared_ptr<ARDOUR::Region> get_single_other_xfade_region (bool start) const; |