diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 615bce86d6..03cdf05ead 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -107,7 +107,7 @@ public: /** Note: changing the name of a Region does not constitute an edit */ bool set_name (const std::string& str); - PBD::PropertyList derive_properties (bool with_times = true) const; + PBD::PropertyList derive_properties (bool with_times = true, bool with_envelope = false) const; const DataType& data_type () const { return _type; } Temporal::TimeDomain time_domain() const; diff --git a/libs/ardour/filter.cc b/libs/ardour/filter.cc index 7d628a7849..fb49601234 100644 --- a/libs/ardour/filter.cc +++ b/libs/ardour/filter.cc @@ -133,7 +133,7 @@ Filter::finish (boost::shared_ptr region, SourceList& nsrcs, string regi } results.clear (); - PropertyList plist (region->derive_properties ()); + PropertyList plist (region->derive_properties (true, false)); plist.add (Properties::start, std::numeric_limits::min()); plist.add (Properties::name, region_name); diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index b0d78eb34d..62afa7cc5e 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -33,6 +33,7 @@ #include "pbd/types_convert.h" #include "pbd/xml++.h" +#include "ardour/audioregion.h" #include "ardour/debug.h" #include "ardour/filter.h" #include "ardour/playlist.h" @@ -1430,7 +1431,7 @@ Region::_set_state (const XMLNode& node, int version, PropertyChange& what_chang } PropertyList -Region::derive_properties (bool with_times) const +Region::derive_properties (bool with_times, bool with_envelope) const { PropertyList plist (properties ()); plist.remove (Properties::automatic); @@ -1438,6 +1439,9 @@ Region::derive_properties (bool with_times) const plist.remove (Properties::left_of_split); plist.remove (Properties::valid_transients); plist.remove (Properties::whole_file); + if (!with_envelope) { + plist.remove (Properties::envelope); + } if (!with_times) { plist.remove (Properties::start); plist.remove (Properties::length);