move session file storage of nested sources from playlist into region, and reload them within Session::XMLRegionFactory, just before we create the region that uses the nested source

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

1 files changed, 29 insertions, 0 deletions

diff --git a/libs/ardour/session_state.cc b/libs/ardour/session_state.cc
index 3af2288b66..3c2496eba5 100644
--- a/libs/ardour/session_state.cc
+++ b/libs/ardour/session_state.cc
@@ -1653,6 +1653,26 @@ Session::load_compounds (const XMLNode& node)
 	return 0;
 }
 
+void
+Session::load_nested_sources (const XMLNode& node)
+{
+	XMLNodeList nlist;
+	XMLNodeConstIterator niter;
+
+	nlist = node.children();
+
+	for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+		if ((*niter)->name() == "Source") {
+			try {
+				SourceFactory::create (*this, **niter, true);
+			} 
+			catch (failed_constructor& err) {
+				error << string_compose (_("Cannot reconstruct nested source for region %1"), name()) << endmsg;
+			}
+		}
+	}
+}
+
 boost::shared_ptr<Region>
 Session::XMLRegionFactory (const XMLNode& node, bool full)
 {
@@ -1660,6 +1680,15 @@ Session::XMLRegionFactory (const XMLNode& node, bool full)
 
 	try {
 
+		const XMLNodeList& nlist = node.children();
+		
+		for (XMLNodeConstIterator niter = nlist.begin(); niter != nlist.end(); ++niter) {
+			XMLNode *child = (*niter);
+			if (child->name() == "NestedSource") {
+				load_nested_sources (*child);
+			}
+		}
+
                 if (!type || type->value() == "audio") {
                         return boost::shared_ptr<Region>(XMLAudioRegionFactory (node, full));
                 } else if (type->value() == "midi") {