diff options
author | David Robillard <d@drobilla.net> | 2007-05-02 23:58:28 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2007-05-02 23:58:28 +0000 |
commit | 40ff85e256ca9094fb75cdcbabd3442339f91ecd (patch) | |
tree | bc2c23a9802110f14836fc87413e08be1b7b7266 /src/progs/ingenuity/App.h | |
parent | 10e23868c8199335ebd360afb62911174075658c (diff) | |
download | ingen-40ff85e256ca9094fb75cdcbabd3442339f91ecd.tar.gz ingen-40ff85e256ca9094fb75cdcbabd3442339f91ecd.tar.bz2 ingen-40ff85e256ca9094fb75cdcbabd3442339f91ecd.zip |
Added svn:ignore property to everything.
Made engine and patch loader separate dynamically loaded modules.
No more monolithic ingenuity (module loaded at runtime).
git-svn-id: http://svn.drobilla.net/lad/ingen@491 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/progs/ingenuity/App.h')
-rw-r--r-- | src/progs/ingenuity/App.h | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/src/progs/ingenuity/App.h b/src/progs/ingenuity/App.h index aaf33893..2ef0891d 100644 --- a/src/progs/ingenuity/App.h +++ b/src/progs/ingenuity/App.h @@ -31,14 +31,19 @@ using std::string; using std::map; using std::list; using std::cerr; using std::endl; -namespace Ingen { namespace Client { - class PatchModel; - class PluginModel; - class Store; - class SigClientInterface; - class ModelEngineInterface; -} } +namespace Ingen { + namespace Shared { + class EngineInterface; + } + namespace Client { + class PatchModel; + class PluginModel; + class Store; + class SigClientInterface; + } +} using namespace Ingen::Client; +using Ingen::Shared::EngineInterface; /** \defgroup Ingenuity GTK Client */ @@ -72,8 +77,8 @@ public: void error_message(const string& msg); - void attach(const SharedPtr<ModelEngineInterface>& engine, - const SharedPtr<SigClientInterface>& client); + void attach(const SharedPtr<EngineInterface>& engine, + const SharedPtr<SigClientInterface>& client); void detach(); @@ -89,10 +94,10 @@ public: Raul::RDF::World* rdf_world() { return &_rdf_world; } - const SharedPtr<ModelEngineInterface>& engine() const { return _engine; } - const SharedPtr<SigClientInterface>& client() const { return _client; } - const SharedPtr<Store>& store() const { return _store; } - const SharedPtr<ThreadedLoader>& loader() const { return _loader; } + const SharedPtr<EngineInterface>& engine() const { return _engine; } + const SharedPtr<SigClientInterface>& client() const { return _client; } + const SharedPtr<Store>& store() const { return _store; } + const SharedPtr<ThreadedLoader>& loader() const { return _loader; } static inline App& instance() { assert(_instance); return *_instance; } static void instantiate(); @@ -101,8 +106,8 @@ protected: App(); static App* _instance; - SharedPtr<ModelEngineInterface> _engine; - SharedPtr<SigClientInterface> _client; + SharedPtr<EngineInterface> _engine; + SharedPtr<SigClientInterface> _client; SharedPtr<Store> _store; SharedPtr<ThreadedLoader> _loader; |