diff options
author | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2012-07-31 00:14:50 +0000 |
commit | 629fb50716083c71146340de97eb8651679ca9fb (patch) | |
tree | 9c5f25fdfd24f3cdb89924062f291a6647580878 /src/bindings/ingen_bindings.cpp | |
parent | 6297b8805c95dd1831ee9a0b9639ae41d00a1473 (diff) | |
download | ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.gz ingen-629fb50716083c71146340de97eb8651679ca9fb.tar.bz2 ingen-629fb50716083c71146340de97eb8651679ca9fb.zip |
Merge Ingen::Shared namespace into Ingen namespace and core libingen library.
git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@4579 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'src/bindings/ingen_bindings.cpp')
-rw-r--r-- | src/bindings/ingen_bindings.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bindings/ingen_bindings.cpp b/src/bindings/ingen_bindings.cpp index 6c92d7bb..39fd9fbf 100644 --- a/src/bindings/ingen_bindings.cpp +++ b/src/bindings/ingen_bindings.cpp @@ -18,10 +18,10 @@ #include "raul/log.hpp" #include "ingen_bindings.hpp" #include "server/Engine.hpp" -#include "ingen/shared/World.hpp" +#include "ingen/World.hpp" bool -run(Ingen::Shared::World* world, const char* filename) +run(Ingen::World* world, const char* filename) { ingen_world = world; @@ -38,22 +38,22 @@ run(Ingen::Shared::World* world, const char* filename) } } -struct IngenBindingsModule : public Ingen::Shared::Module { - void load(Ingen::Shared::World* world) { +struct IngenBindingsModule : public Ingen::Module { + void load(Ingen::World* world) { world->script_runners.insert(make_pair("application/x-python", &run)); } }; extern "C" { -Ingen::Shared::Module* +Ingen::Module* ingen_module_load() { return new IngenBindingsModule(); } void -script_iteration(Ingen::Shared::World* world) +script_iteration(Ingen::World* world) { if (world->engine()) world->engine()->main_iteration(); |