Bug fixes so that region split does not clobber region gain envelopes.

git-svn-id: svn://localhost/ardour2/branches/3.0@4340 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc
index 5d4748c2d4bffbdf7f4f41e94a4c83a22a8ff954..5b31aa44ff3d6c4e17eebe7c3a37f3e2990ce941 100644 (file)
--- a/libs/ardour/audioregion.cc
+++ b/libs/ardour/audioregion.cc
@@ -155,7 +155,6 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t
        }
 
        /* return to default fades if the existing ones are too long */
-       init ();
 
        if (_flags & LeftOfSplit) {
                if (_fade_in->back()->when >= _length) {
@@ -180,6 +179,8 @@ AudioRegion::AudioRegion (boost::shared_ptr<const AudioRegion> other, nframes_t
        _scale_amplitude = other->_scale_amplitude;
 
        assert(_type == DataType::AUDIO);
+       
+       listen_to_my_curves ();
        listen_to_my_sources ();
 }
 

diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc
index 68bbd1716244434c47f252ef24380658e41f5cca..7be69337fc5c66db2f0abd67efa56c9bc94ba6b5 100644 (file)
--- a/libs/ardour/automation_list.cc
+++ b/libs/ardour/automation_list.cc
@@ -73,7 +73,7 @@ AutomationList::AutomationList (const AutomationList& other)
 }
 
 AutomationList::AutomationList (const AutomationList& other, double start, double end)
-       : ControlList(other)
+       : ControlList(other, start, end)
 {
        _style = other._style;
        _state = other._state;