diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-01 00:09:03 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-11-01 00:09:03 +0000 |
| commit | e4e165d5ae804c11c11a37f2f4f164daa8272505 (patch) | |
| tree | 38fba7b794947b4310d292ee575fcf1f0d76df06 | |
| parent | 80ef7a84153f83e60147839c2a04a83f21b62719 (diff) | |
debugging some crashes with oofus + flowrobot
git-svn-id: svn://localhost/ardour2/trunk@1044 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | libs/ardour/audioregion.cc | 14 | ||||
| -rw-r--r-- | libs/ardour/automation_event.cc | 2 |
2 files changed, 7 insertions, 9 deletions
diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 7b6d576f35..a8e6ddc05b 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -701,25 +701,23 @@ AudioRegion::set_live_state (const XMLNode& node, Change& what_changed, bool sen _envelope.set_max_xval (_length); _envelope.truncate_end (_length); + cerr << "envelope for " << _name << " has " << _envelope.size() << " points\n"; + } else if (child->name() == "FadeIn") { _fade_in.clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_in.set_state (*child)) { set_default_fade_in (); - } else { - _fade_in.set_state (*child); - } + } } else if (child->name() == "FadeOut") { _fade_out.clear (); - if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0) { + if ((prop = child->property ("default")) != 0 || (prop = child->property ("steepness")) != 0 || _fade_out.set_state (*child)) { set_default_fade_out (); - } else { - _fade_out.set_state (*child); - } + } } } diff --git a/libs/ardour/automation_event.cc b/libs/ardour/automation_event.cc index 1d61f90d9d..a2eeebed56 100644 --- a/libs/ardour/automation_event.cc +++ b/libs/ardour/automation_event.cc @@ -1254,7 +1254,7 @@ AutomationList::set_state (const XMLNode& node) return deserialize_events (node); } - if (node.name() == X_("Envelope")) { + if (node.name() == X_("Envelope") || node.name() == X_("FadeOut") || node.name() == X_("FadeIn")) { /* old school */ |