diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/audioplaylist.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/audioregion.h | 18 | ||||
| -rw-r--r-- | libs/ardour/ardour/playlist.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/session_configuration_vars.h | 3 |
4 files changed, 0 insertions, 24 deletions
diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index a5f6b4ef39..478d4872cd 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -49,8 +49,6 @@ public: protected: - void check_crossfades (Evoral::Range<framepos_t>); - void pre_combine (std::vector<boost::shared_ptr<Region> >&); void post_combine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); void pre_uncombine (std::vector<boost::shared_ptr<Region> >&, boost::shared_ptr<Region>); 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&); diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 6de772390e..f3277c6b9c 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -336,7 +336,6 @@ public: void splice_locked (framepos_t at, framecnt_t distance, boost::shared_ptr<Region> exclude); void splice_unlocked (framepos_t at, framecnt_t distance, boost::shared_ptr<Region> exclude); - virtual void check_crossfades (Evoral::Range<framepos_t>) {} virtual void remove_dependents (boost::shared_ptr<Region> /*region*/) {} virtual XMLNode& state (bool); diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index 1a4a17ce5d..3e2d21d107 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -25,10 +25,7 @@ the value of the variable. *****************************************************/ -CONFIG_VARIABLE (CrossfadeModel, xfade_model, "xfade-model", FullCrossfade) CONFIG_VARIABLE (CrossfadeChoice, xfade_choice, "xfade-choice", ConstantPowerMinus3dB) -CONFIG_VARIABLE (bool, auto_xfade, "auto-xfade", true) -CONFIG_VARIABLE (float, short_xfade_seconds, "short-xfade-seconds", 0.015) CONFIG_VARIABLE (uint32_t, destructive_xfade_msecs, "destructive-xfade-msecs", 2) CONFIG_VARIABLE (bool, use_region_fades, "use-region-fades", true) CONFIG_VARIABLE (bool, show_region_fades, "show-region-fades", true) |