summaryrefslogtreecommitdiffstats
path: root/src/progs/ingenuity/ThreadedLoader.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2007-05-01 23:58:38 +0000
committerDavid Robillard <d@drobilla.net>2007-05-01 23:58:38 +0000
commit10e23868c8199335ebd360afb62911174075658c (patch)
tree5ca362855ca1b2809b1e4ca95ecbcdf3fe8bf60b /src/progs/ingenuity/ThreadedLoader.h
parent2772d11a284f199342ef86e9169865968577a17c (diff)
downloadingen-10e23868c8199335ebd360afb62911174075658c.tar.gz
ingen-10e23868c8199335ebd360afb62911174075658c.tar.bz2
ingen-10e23868c8199335ebd360afb62911174075658c.zip
Moved loading out to it's own namespace.
git-svn-id: http://svn.drobilla.net/lad/ingen@490 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/ingenuity/ThreadedLoader.h')
-rw-r--r--src/progs/ingenuity/ThreadedLoader.h16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/progs/ingenuity/ThreadedLoader.h b/src/progs/ingenuity/ThreadedLoader.h
index 4cab4acb..bf2c2ed5 100644
--- a/src/progs/ingenuity/ThreadedLoader.h
+++ b/src/progs/ingenuity/ThreadedLoader.h
@@ -22,15 +22,15 @@
#include <list>
#include <cassert>
#include <boost/optional/optional.hpp>
-#include "raul/Thread.h"
-#include "raul/Slave.h"
-#include "raul/Mutex.h"
-#include "raul/Condition.h"
+#include <raul/Thread.h>
+#include <raul/Slave.h>
+#include <raul/Mutex.h>
+#include <raul/Condition.h>
#include "ModelEngineInterface.h"
-#include "ObjectModel.h"
#include "Serializer.h"
#include "DeprecatedLoader.h"
#include "Loader.h"
+#include "PatchModel.h"
using std::string;
using std::list;
using boost::optional;
@@ -57,9 +57,6 @@ public:
ThreadedLoader(SharedPtr<ModelEngineInterface> engine);
~ThreadedLoader();
- //Loader& loader() const { return *_loader; }
- //Serializer& serializer() const { return *_serializer; }
-
// FIXME: there's a pattern here....
// (same core interface as Loader/Serializer)
@@ -82,8 +79,9 @@ private:
void _whipped();
+ SharedPtr<ModelEngineInterface> _engine;
+
DeprecatedLoader _deprecated_loader;
- Loader _loader;
Serializer _serializer;
Raul::Mutex _mutex;
list<Closure> _events;