diff options
| author | Ben Loftis <ben@glw.com> | 2012-12-13 16:42:05 +0000 |
|---|---|---|
| committer | Ben Loftis <ben@glw.com> | 2012-12-13 16:42:05 +0000 |
| commit | 2292e33ee418070c4d12971a72e01eb29dfc8de9 (patch) | |
| tree | 6ed7d15db7ff0984efd2bd87f6f3cfa22adc3444 /libs/ardour/ardour/audioregion.h | |
| parent | 1224fc07007a99a138678a800497c841f4f04e1b (diff) | |
crossfade hack and slash. removed overlap checks, overlap mode, default length, fade_is_xfade, fade_is_short, and other leftovers from previous crossfade models. Draw crossfade drags in realtime so fade_line is no longer needed. remove code for hiding crossfades during a drag. moved crossfade rect to top layer so crossfade lines dont grab mouse focus. drag-trim-with-fixed-fade-anchor is partially implemented and needs discussion
git-svn-id: svn://localhost/ardour2/branches/3.0@13659 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audioregion.h')
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 4213dc1a6c..67946caa6f 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -46,10 +46,6 @@ namespace Properties { extern PBD::PropertyDescriptor<bool> fade_in_active; extern PBD::PropertyDescriptor<bool> fade_out_active; extern PBD::PropertyDescriptor<float> scale_amplitude; - extern PBD::PropertyDescriptor<bool> fade_out_is_xfade; - extern PBD::PropertyDescriptor<bool> fade_out_is_short; - extern PBD::PropertyDescriptor<bool> fade_in_is_xfade; - extern PBD::PropertyDescriptor<bool> fade_in_is_short; extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_in; extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > inverse_fade_in; extern PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > fade_out; @@ -88,16 +84,6 @@ class AudioRegion : public Region bool fade_in_active () const { return _fade_in_active; } bool fade_out_active () const { return _fade_out_active; } - bool fade_in_is_xfade() const { return _fade_in_is_xfade; } - void set_fade_in_is_xfade (bool yn); - 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.val (); } boost::shared_ptr<AutomationList> inverse_fade_in() { return _inverse_fade_in.val (); } boost::shared_ptr<AutomationList> fade_out() { return _fade_out.val (); } @@ -203,10 +189,6 @@ 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&); |