summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/client/DeprecatedLoader.cpp2
-rw-r--r--src/engine/wscript6
2 files changed, 3 insertions, 5 deletions
diff --git a/src/client/DeprecatedLoader.cpp b/src/client/DeprecatedLoader.cpp
index b30c096a..29172cee 100644
--- a/src/client/DeprecatedLoader.cpp
+++ b/src/client/DeprecatedLoader.cpp
@@ -572,7 +572,7 @@ DeprecatedLoader::load_subpatch(const string& base_filename, const Path& parent,
cout << "[DeprecatedLoader] Loading subpatch " << filename << " under " << parent << endl;
// load_patch sets the passed variable last, so values stored in the parent
// will override values stored in the child patch file
- load_patch(filename, false, parent, Symbol(Symbol::symbolify(name)), initial_data, false);
+ load_patch(filename, false, parent, Symbol(nameify_if_invalid(name)), initial_data, false);
return false;
}
diff --git a/src/engine/wscript b/src/engine/wscript
index 5bf263d3..271c948f 100644
--- a/src/engine/wscript
+++ b/src/engine/wscript
@@ -37,9 +37,8 @@ def build(bld):
QueuedEvent.cpp
TransportNode.cpp
ingen_engine.cpp
- events/SendPortActivityEvent.cpp
- events/SendPortValueEvent.cpp
-
+ events/SendPortActivityEvent.cpp
+ events/SendPortValueEvent.cpp
'''
if bld.env()['HAVE_LADSPA']:
obj.source += ' LADSPANode.cpp '
@@ -79,7 +78,6 @@ def build(bld):
events/RequestPluginEvent.cpp
events/RequestPluginsEvent.cpp
events/RequestPortValueEvent.cpp
-
events/SetMetadataEvent.cpp
events/SetPolyphonicEvent.cpp
events/SetPolyphonyEvent.cpp