diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 15:50:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2006-10-09 15:50:44 +0000 |
| commit | 0d0f71ee92fb7ce53fbcb8c7b0cd93b1cdf3529f (patch) | |
| tree | ae37075200040cbbd430b98ee3cbce59eaef51ca /libs/ardour/playlist.cc | |
| parent | 8011cbf5f8e4181ac39e4140e681fcad531f4a7c (diff) | |
fix abort-capture path, including many subtle issues with shared_ptr<>; remove old automation feedback code; make new automation feedback code slightly configurable ; fix zoom focus options for playhead + edit cursor ; prevent zoom < 2 samples per pixel to avoid crashes ; peak building now uses shared_ptr<Source> not Source*
git-svn-id: svn://localhost/ardour2/trunk@959 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/playlist.cc')
| -rw-r--r-- | libs/ardour/playlist.cc | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 6d6a07da95..38c7e387f8 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -1373,10 +1373,21 @@ Playlist::set_state (const XMLNode& node) if (child->name() == "Region") { - if ((region = RegionFactory::create (_session, *child, true)) == 0) { - error << _("Playlist: cannot create region from state file") << endmsg; +#if 0 + if ((prop = child->property ("id")) == 0) { + error << _("region state node has no ID, ignored") << endmsg; continue; } + + ID id = prop->value (); + + if ((region = region_by_id (id)) == 0) { +#endif + if ((region = RegionFactory::create (_session, *child, true)) == 0) { + error << _("Playlist: cannot create region from state file") << endmsg; + continue; + } +// } add_region (region, region->position(), 1.0, false); |