diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-15 18:56:11 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-10-15 18:56:11 +0000 |
commit | 8713667ec1a6cc9ba56c07f763e5a422cc47fbef (patch) | |
tree | 56727634d8a1567679a7ba76cff93bf06e7c271f /libs/ardour/region.cc | |
parent | 79f91c7a205d981d2b8cc15e32a6da02d8423065 (diff) |
rework Stateful::set_state() patch to avoid default version argument
git-svn-id: svn://localhost/ardour2/branches/3.0@5787 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/region.cc')
-rw-r--r-- | libs/ardour/region.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 244312bc0a..903452ca03 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -298,7 +298,7 @@ Region::Region (const SourceList& srcs, const XMLNode& node) { use_sources (srcs); - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } @@ -328,7 +328,7 @@ Region::Region (boost::shared_ptr<Source> src, const XMLNode& node) { _sources.push_back (src); - if (set_state (node)) { + if (set_state (node, Stateful::loading_state_version)) { throw failed_constructor(); } @@ -1172,7 +1172,7 @@ Region::get_state () } int -Region::set_live_state (const XMLNode& node, Change& what_changed, bool send) +Region::set_live_state (const XMLNode& node, int version, Change& what_changed, bool send) { const XMLNodeList& nlist = node.children(); const XMLProperty *prop; @@ -1355,7 +1355,7 @@ Region::set_state (const XMLNode& node, int version) _first_edit = EditChangesNothing; - set_live_state (node, what_changed, true); + set_live_state (node, version, what_changed, true); return 0; } |