From 602e31074b30167baace71ccfff1f58a6b3f0626 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Sun, 17 Aug 2008 18:58:24 +0000 Subject: More serialization work. Preliminary copy/paste (nodes only) git-svn-id: http://svn.drobilla.net/lad/ingen@1418 a436a847-0d15-0410-975c-d299462d15a1 --- src/libs/gui/ThreadedLoader.cpp | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) (limited to 'src/libs/gui/ThreadedLoader.cpp') diff --git a/src/libs/gui/ThreadedLoader.cpp b/src/libs/gui/ThreadedLoader.cpp index d85d54a3..88dd4b1a 100644 --- a/src/libs/gui/ThreadedLoader.cpp +++ b/src/libs/gui/ThreadedLoader.cpp @@ -36,8 +36,18 @@ ThreadedLoader::ThreadedLoader(SharedPtr engine) { set_name("Loader"); - // FIXME: rework this so the thread is only present when it's doing something (save mem) - // and module isn't loaded until required + if (parser()) + start(); + else + cerr << "WARNING: Failed to load ingen_serialisation module, load disabled." << endl; +} + + +SharedPtr +ThreadedLoader::parser() +{ + if (_parser) + return _parser; World* world = App::instance().world(); if (!world->serialisation_module) @@ -53,15 +63,7 @@ ThreadedLoader::ThreadedLoader(SharedPtr engine) _parser = SharedPtr(new_parser()); } - if (_parser) - start(); - else - cerr << "WARNING: Failed to load ingen_serialisation module, load disabled." << endl; -} - - -ThreadedLoader::~ThreadedLoader() -{ + return _parser; } -- cgit v1.2.1