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

1 files changed, 6 insertions, 13 deletions

diff --git a/src/bindings/ingen.i b/src/bindings/ingen.i
index 6b39eb33..b29a61ce 100644
--- a/src/bindings/ingen.i
+++ b/src/bindings/ingen.i
@@ -9,8 +9,6 @@
 #include "Client.hpp"
 %}
 
-/*%ignore Ingen::Shared::EngineInterface;*/
-
 %include "../../ingen/CommonInterface.hpp"
 %include "../../ingen/ClientInterface.hpp"
 %include "../../ingen/EngineInterface.hpp"
@@ -21,34 +19,29 @@
 // generate directors for all classes that have virtual methods
 %feature("director");         
 %feature("director") Ingen::ClientInterface;
-//%feature("director") Ingen::Shared::EngineInterface;
 
-typedef Ingen::Shared::World World;
-namespace Ingen { namespace Shared {
+typedef Ingen::World World;
+namespace Ingen {
 %extend World {
     World() {
-        if (!Ingen::Shared::ingen_world) {
+        if (!Ingen::ingen_world) {
             fprintf(stderr, "ERROR: World uninitialized (running within Ingen?)\n");
             abort();
         } else {
-            return Ingen::Shared::ingen_world;
+            return Ingen::ingen_world;
         }
     }
 
     void iteration() {
-        Ingen::Shared::script_iteration($self);
+        Ingen::script_iteration($self);
     }
 
     /*LILVWorld lilv() { return $self->me->lilv_world; }*/
 };
 
-} }
+}
 
 
 %include "Client.hpp"
 
 %feature("director") Client;
-
-
-/*SharedPtr<Ingen::Shared::EngineInterface> engine() { return $self->me->engine; }*/
-