1 files changed, 21 insertions, 116 deletions
diff --git a/swig/slv2.i b/swig/slv2.i
index 5bc9a5d..7d0c664 100644
--- a/swig/slv2.i
+++ b/swig/slv2.i
@@ -1,125 +1,30 @@
 %module slv2
 %{
-#include "slv2/plugin.h"
-#include "slv2/pluginclass.h"
-#include "slv2/pluginclasses.h"
-#include "slv2/plugininstance.h"
-#include "slv2/plugins.h"
-#include "slv2/port.h"
 #include "slv2/slv2.h"
-#include "slv2/types.h"
-#include "slv2/value.h"
-#include "slv2/values.h"
-#include "slv2/world.h"
-typedef struct { SLV2World me; } World;
-typedef struct { SLV2World world; SLV2Plugins me; } Plugins;
-typedef struct { SLV2World world; SLV2Plugin me; } Plugin;
+#include "slv2/slv2mm.hpp"
 %}
- 
-%include "slv2/plugin.h"
-%include "slv2/pluginclass.h"
-%include "slv2/pluginclasses.h"
-%include "slv2/plugininstance.h"
-%include "slv2/plugins.h"
-%include "slv2/port.h"
 %include "slv2/slv2.h"
-%include "slv2/types.h"
-%include "slv2/value.h"
-%include "slv2/values.h"
-%include "slv2/world.h"
-
-typedef struct { SLV2Plugin me; } Plugin;
-%extend Plugin {
-    Plugin(SLV2Plugin p) {
-        Plugin* ret = (Plugin*)malloc(sizeof(Plugin));
-        ret->me = p;
-        return ret;
-    }
-    
-    ~Plugin() {
-        /* FIXME: free SLV2Plugin here? */
-        free($self);
-    }
-
-    char* name() {
-        SLV2Value nm = slv2_plugin_get_name($self->me);
-        char* ret = nm ? strdup((char*)slv2_value_as_string(nm)) : strdup("");
-        slv2_value_free(nm);
-        return ret;
-    }
-    const char* uri() {
-        return strdup((char*)slv2_value_as_string(slv2_plugin_get_uri($self->me)));
-    }
-};
-
-typedef struct { SLV2World world; SLV2Plugins me; } Plugins;
+%include "slv2/slv2mm.hpp"
+namespace SLV2 {
 %extend Plugins {
-    Plugins(SLV2World w, SLV2Plugins p) {
-        Plugins* ret = (Plugins*)malloc(sizeof(Plugins));
-        ret->world = w;
-        ret->me = p;
-        return ret;
-    }
-
-    ~Plugins() {
-        slv2_plugins_free($self->world, $self->me);
-        free($self);
-    }
-
-    inline unsigned size() const { return slv2_plugins_size($self->me); }
-
-#ifdef PYTHON
-    Plugin* __getitem__(unsigned i) {
-        if (i < slv2_plugins_size($self->me))
-            return new_Plugin(slv2_plugins_get_at($self->me, i));
-        else
-            return NULL;
-    }
-
-    inline unsigned __len__() const { return slv2_plugins_size($self->me); }
-
 %pythoncode %{
-    def __iter__(self):
-        class Iterator(object):
-            def __init__(self, plugins):
-                self.plugins = plugins
-                self.iter = 0
-
-            def next(self):
-                if self.iter < self.plugins.size():
-                    self.iter += 1
-                    return Plugin(slv2_plugins_get_at(self.plugins.me, self.iter-1))
-                else:
-                    raise StopIteration
-
-        return Iterator(self)
+	def __iter__(self):
+		class Iterator(object):
+			def __init__(self, plugins):
+				self.plugins = plugins
+				self.index   = 0
+	                
+			def __iter__(self):
+				return self
+		
+			def next(self):
+				self.index += 1
+				if self.index < slv2_plugins_size(self.plugins.me):
+					return Plugin(slv2_plugins_get_at(self.plugins.me, self.index))
+				else:
+					raise StopIteration
+
+		return Iterator(self)
 %}
-#endif
-};
-
-typedef struct { SLV2World me; } World;
-%extend World {
-    World() {
-        World* ret = (World*)malloc(sizeof(World));
-        ret->me = slv2_world_new();
-        return ret;
-    }
-    
-    ~World() {
-        slv2_world_free($self->me);
-        free($self);
-    }
-
-    void load_all() { slv2_world_load_all($self->me); }
-    void load_bundle(const char* uri) {
-        SLV2Value bundle_uri = slv2_value_new_uri($self->me, uri);
-        slv2_world_load_bundle($self->me, bundle_uri);
-        slv2_value_free(bundle_uri);
-    }
-   
-    Plugins* get_all_plugins() {
-        return new_Plugins($self->me, slv2_world_get_all_plugins($self->me));
-    }
 };
-
-
+}