diff options
Diffstat (limited to 'libs/ardour/audioregion.cc')
-rw-r--r-- | libs/ardour/audioregion.cc | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 359c729368..dcf17ba2ea 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -73,9 +73,9 @@ AudioRegion::init () /* constructor for use by derived types only */ AudioRegion::AudioRegion (nframes_t start, nframes_t length, string name) : Region (start, length, name, DataType::AUDIO) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { init (); } @@ -83,9 +83,9 @@ AudioRegion::AudioRegion (nframes_t start, nframes_t length, string name) /** Basic AudioRegion constructor (one channel) */ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, nframes_t length) : Region (src, start, length, PBD::basename_nosuffix(src->name()), DataType::AUDIO, 0, Region::Flag(Region::DefaultFlags|Region::External)) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { @@ -98,9 +98,9 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, n /* Basic AudioRegion constructor (one channel) */ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (src, start, length, name, DataType::AUDIO, layer, flags) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { @@ -113,9 +113,9 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, nframes_t start, n /* Basic AudioRegion constructor (many channels) */ AudioRegion::AudioRegion (SourceList& srcs, nframes_t start, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (srcs, start, length, name, DataType::AUDIO, layer, flags) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { init (); } @@ -124,9 +124,9 @@ AudioRegion::AudioRegion (SourceList& srcs, nframes_t start, nframes_t length, c /** Create a new AudioRegion, that is part of an existing one */ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t offset, nframes_t length, const string& name, layer_t layer, Flag flags) : Region (other, offset, length, name, layer, flags) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { /* return to default fades if the existing ones are too long */ _fade_in_disabled = 0; @@ -162,9 +162,9 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other) : Region (other) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { _scale_amplitude = other->_scale_amplitude; _envelope = other->_envelope; @@ -179,9 +179,9 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other) AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& node) : Region (src, node) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { boost::shared_ptr<AudioFileSource> afs = boost::dynamic_pointer_cast<AudioFileSource> (src); if (afs) { @@ -201,9 +201,9 @@ AudioRegion::AudioRegion (boost::shared_ptr<AudioSource> src, const XMLNode& nod AudioRegion::AudioRegion (SourceList& srcs, const XMLNode& node) : Region (srcs, node) - , _fade_in (new AutomationList(ParamID(FadeInAutomation), 0.0, 2.0, 1.0)) - , _fade_out (new AutomationList(ParamID(FadeOutAutomation), 0.0, 2.0, 1.0)) - , _envelope (new AutomationList(ParamID(EnvelopeAutomation), 0.0, 2.0, 1.0)) + , _fade_in (new AutomationList(Parameter(FadeInAutomation), 0.0, 2.0, 1.0)) + , _fade_out (new AutomationList(Parameter(FadeOutAutomation), 0.0, 2.0, 1.0)) + , _envelope (new AutomationList(Parameter(EnvelopeAutomation), 0.0, 2.0, 1.0)) { set_default_fades (); _scale_amplitude = 1.0; |