diff options
author | David Robillard <d@drobilla.net> | 2008-08-17 06:38:33 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-08-17 06:38:33 +0000 |
commit | 03acefb8271d2abb5160b349d8e70687af6965fb (patch) | |
tree | e377017141707b2a97eeda4adffcfbb56eec88bc /src/libs/gui/ThreadedLoader.cpp | |
parent | 696535322342c56901d4d48641b6f9cf816ac1e1 (diff) | |
download | ingen-03acefb8271d2abb5160b349d8e70687af6965fb.tar.gz ingen-03acefb8271d2abb5160b349d8e70687af6965fb.tar.bz2 ingen-03acefb8271d2abb5160b349d8e70687af6965fb.zip |
Clean up parser into generic form that can parse anything (rather than just the root patch from a document).
Support for parsing from a string.
Fix serialisation to a string.
git-svn-id: http://svn.drobilla.net/lad/ingen@1414 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/libs/gui/ThreadedLoader.cpp')
-rw-r--r-- | src/libs/gui/ThreadedLoader.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp index 8c8af828..d85d54a3 100644 --- a/src/libs/gui/ThreadedLoader.cpp +++ b/src/libs/gui/ThreadedLoader.cpp @@ -80,11 +80,11 @@ ThreadedLoader::_whipped() void ThreadedLoader::load_patch(bool merge, - const string& data_base_uri, + const Glib::ustring& data_base_uri, const Path& data_path, GraphObject::Variables engine_data, optional<Path> engine_parent, - optional<const string&> engine_name) + optional<Symbol> engine_symbol) { _mutex.lock(); @@ -94,18 +94,18 @@ ThreadedLoader::load_patch(bool merge, sigc::mem_fun(_deprecated_loader, &DeprecatedLoader::load_patch), data_base_uri, engine_parent, - (engine_name) ? engine_name.get() : "", + (engine_symbol) ? engine_symbol.get() : "", engine_data, false))); } else { _events.push_back(sigc::hide_return(sigc::bind( - sigc::mem_fun(_parser.get(), &Ingen::Serialisation::Parser::parse), + sigc::mem_fun(_parser.get(), &Ingen::Serialisation::Parser::parse_document), App::instance().world(), App::instance().world()->engine.get(), - data_base_uri, + data_base_uri, // document + data_base_uri, // patch (root of document) engine_parent, - (engine_name) ? engine_name.get() : "", - "", + engine_symbol, engine_data))); } |