diff options
author | David Robillard <d@drobilla.net> | 2008-10-12 08:45:55 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-10-12 08:45:55 +0000 |
commit | 141c34e297b1ffde3293c42f26181bd3d895b2c4 (patch) | |
tree | b37d3b7ac7e3c0ccb6957cdc5d510bcbbc7db382 /src/client/DeprecatedLoader.hpp | |
parent | 9f0415450bba9b0c32dfd1b9c4033f57806c35cc (diff) | |
download | ingen-141c34e297b1ffde3293c42f26181bd3d895b2c4.tar.gz ingen-141c34e297b1ffde3293c42f26181bd3d895b2c4.tar.bz2 ingen-141c34e297b1ffde3293c42f26181bd3d895b2c4.zip |
Fix Om patch loading (import and load as child).
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1656 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/client/DeprecatedLoader.hpp')
-rw-r--r-- | src/client/DeprecatedLoader.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/client/DeprecatedLoader.hpp b/src/client/DeprecatedLoader.hpp index c1af52c2..f7213aca 100644 --- a/src/client/DeprecatedLoader.hpp +++ b/src/client/DeprecatedLoader.hpp @@ -62,11 +62,12 @@ public: string find_file(const string& filename, const string& additional_path = ""); - string load_patch(const Glib::ustring& filename, - boost::optional<Path> parent_path, - string name, - GraphObject::Variables initial_data, - bool existing = false); + string load_patch(const Glib::ustring& filename, + bool merge, + boost::optional<Path> parent_path, + boost::optional<Symbol> name, + GraphObject::Variables initial_data, + bool existing = false); private: void add_variable(GraphObject::Variables& data, string key, string value); |