diff options
Diffstat (limited to 'libs/ardour')
-rw-r--r-- | libs/ardour/playlist.cc | 2 | ||||
-rw-r--r-- | libs/ardour/region.cc | 2 | ||||
-rw-r--r-- | libs/ardour/region_factory.cc | 6 | ||||
-rw-r--r-- | libs/ardour/route_group.cc | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 851cf8596e..6ff51193d9 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -2144,7 +2144,7 @@ Playlist::property_factory (const XMLNode& history_node) const RegionListProperty* rlp = new RegionListProperty (*const_cast<Playlist*> (this)); - if (rlp->load_history_state (**i)) { + if (rlp->set_change (**i)) { if (!prop_list) { prop_list = new PropertyList(); } diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 65f7d6fedc..da26c87f26 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -1216,7 +1216,7 @@ Region::_set_state (const XMLNode& node, int version, PropertyChange& what_chang { const XMLProperty* prop; - what_changed = set_properties (node); + what_changed = set_values (node); if ((prop = node.property (X_("id")))) { _id = prop->value(); diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index b4beddfb64..a8b0d436d6 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -123,7 +123,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, frameoffset_t offset, b } if (ret) { - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -162,7 +162,7 @@ RegionFactory::create (boost::shared_ptr<Region> region, const SourceList& srcs, if (ret) { - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { @@ -207,7 +207,7 @@ RegionFactory::create (const SourceList& srcs, const PropertyList& plist, bool a if (ret) { - ret->set_properties (plist); + ret->apply_changes (plist); map_add (ret); if (announce) { diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index 0b0a072509..f1631e4375 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -235,7 +235,7 @@ RouteGroup::set_state (const XMLNode& node, int version) return set_state_2X (node, version); } - set_properties (node); + set_values (node); const XMLProperty *prop; @@ -260,7 +260,7 @@ RouteGroup::set_state (const XMLNode& node, int version) int RouteGroup::set_state_2X (const XMLNode& node, int /*version*/) { - set_properties (node); + set_values (node); if (node.name() == "MixGroup") { _gain = true; |