X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FSWF.c;h=8700e811fd66c4618b6f0eaeebdda4ad8579551c;hb=a18cdd835cad27c679d6a9659836f035fc3a0b5c;hp=2a5b903b539a1ac96bab99ac690494c30304ca8d;hpb=6861429e78f6d4777fd2ad05c3e91f4bb7fd0788;p=swftools.git

diff --git a/lib/python/SWF.c b/lib/python/SWF.c
index 2a5b903..8700e81 100644
--- a/lib/python/SWF.c
+++ b/lib/python/SWF.c
@@ -25,8 +25,8 @@
 #include "../rfxswf.h"
 #include "../log.h"
 #include "./pyutils.h"
-#include "primitives.h"
-#include "action.h"
+#include "./tag.h"
+#include "./taglist.h"
 
 /*
 TODO:
@@ -42,38 +42,17 @@ TODO:
 //-------------------------- Types -------------------------------------------
 
 staticforward PyTypeObject SWFClass;
-staticforward PyTypeObject TagListClass;
-staticforward PyTypeObject TagClass;
 
 /* Tags, Objects */
 
 typedef struct {
     PyObject_HEAD
-    TAG*tag;
-    /* ST_DEFINEFONT*/
-    SWFFONT* font;
-    /* ST_PLACEOBJECT, ST_PLACEOBJECT2*/
-    SWFPLACEOBJECT* placeobject;
-    PyObject* character;
-} TagObject;
-
-typedef struct {
-    PyObject_HEAD
-    TAG*firstTag;
-    TAG*searchTag;
-    TAG*lastTag;
-    PyDictObject* char2id;
-    PyDictObject* id2char;
-    U16 currentID;
-} TagListObject;
-
-typedef struct {
-    PyObject_HEAD
     SWF swf; //swf.firstTag ist not used
-    TagListObject*taglist;
+    PyObject*taglist;
     char*filename;
 } SWFObject;
 
+
 //----------------------------------------------------------------------------
 static PyObject* f_create(PyObject* self, PyObject* args, PyObject* kwargs)
 {
@@ -103,13 +82,7 @@ static PyObject* f_create(PyObject* self, PyObject* args, PyObject* kwargs)
     swf->swf.fileVersion = version;
     swf->swf.frameRate = (int)(framerate*0x100);
     swf->swf.movieSize = bbox;
-    swf->taglist = PyObject_New(TagListObject, &TagListClass);
-    swf->taglist->firstTag = 0;
-    swf->taglist->searchTag = 0;
-    swf->taglist->lastTag = 0;
-    swf->taglist->currentID = 1;
-    swf->taglist->char2id = (PyDictObject*)PyDict_New();
-    swf->taglist->id2char = (PyDictObject*)PyDict_New();
+    swf->taglist = taglist_new();
 
     if(swf->swf.fileVersion>=6)
 	swf->swf.compressed = 1;
@@ -130,7 +103,6 @@ static PyObject* f_load(PyObject* self, PyObject* args)
     swf = PyObject_New(SWFObject, &SWFClass);
     memset(&swf->swf, 0, sizeof(SWF));
     swf->filename = strdup(filename);
-    swf->taglist = PyObject_New(TagListObject, &TagListClass);
 
     if(!filename) {
 	PyErr_SetString(PyExc_Exception, setError("Couldn't open file %s", filename));
@@ -147,17 +119,10 @@ static PyObject* f_load(PyObject* self, PyObject* args)
 	return 0;
     }
     close(fi);
-    
-    swf->taglist->firstTag = swf->swf.firstTag;
-    swf->taglist->searchTag = swf->swf.firstTag;
-    swf->taglist->lastTag = swf->swf.firstTag;
-    while(swf->taglist->lastTag->next)
-	swf->taglist->lastTag = swf->taglist->lastTag->next;
-    swf->taglist->currentID = 1;
-    swf->taglist->char2id = (PyDictObject*)PyDict_New();
-    swf->taglist->id2char = (PyDictObject*)PyDict_New();
     swf->swf.firstTag = 0;
 
+    swf->taglist = taglist_new2(swf->swf.firstTag);
+    
     mylog("load %08x -> %08x\n", (int)self, (int)swf);
     return (PyObject*)swf;
 }
@@ -186,7 +151,7 @@ static PyObject * swf_save(PyObject* self, PyObject* args, PyObject* kwargs)
     if(compress)
 	swf->compressed = 1;
     
-    swf->firstTag = swfo->taglist->firstTag;
+    swf->firstTag = taglist_getTAGs(swfo->taglist);
 
     // fix the file, in case it is empty or not terminated properly
     {
@@ -230,54 +195,12 @@ static PyObject * swf_writeCGI(PyObject* self, PyObject* args)
     SWFObject*swf = (SWFObject*)self;
     if(!self || !PyArg_ParseTuple(args,"")) 
 	return NULL;
-    swf->swf.firstTag = swf->taglist->firstTag;
+    swf->swf.firstTag = taglist_getTAGs(swf->taglist);
     swf_WriteCGI(&swf->swf);
     swf->swf.firstTag = 0;
     return PY_NONE;
 }
 //----------------------------------------------------------------------------
-static PyObject * taglist_foldAll(PyObject* self, PyObject* args)
-{
-    SWF swf;
-    TagListObject*taglist = (TagListObject*)self;
-    if(!self || !PyArg_ParseTuple(args,"")) 
-	return NULL;
-    swf.firstTag = taglist->firstTag;
-    swf_FoldAll(&swf);
-    taglist->firstTag = swf.firstTag;
-    taglist->lastTag = 0; // FIXME
-    taglist->searchTag = 0;
-    return PY_NONE;
-}
-//----------------------------------------------------------------------------
-static PyObject * taglist_unfoldAll(PyObject* self, PyObject* args)
-{
-    SWF swf;
-    TagListObject*taglist = (TagListObject*)self;
-    if(!self || !PyArg_ParseTuple(args,"")) 
-	return NULL;
-    swf.firstTag = taglist->firstTag;
-    swf_UnFoldAll(&swf);
-    taglist->firstTag = swf.firstTag;
-    taglist->lastTag = 0; // FIXME
-    taglist->searchTag = 0;
-    return PY_NONE;
-}
-//----------------------------------------------------------------------------
-static PyObject * taglist_optimizeOrder(PyObject* self, PyObject* args)
-{
-    SWF swf;
-    TagListObject*taglist = (TagListObject*)self;
-    if(!self || !PyArg_ParseTuple(args,"")) 
-	return NULL;
-    swf.firstTag = taglist->firstTag;
-    swf_UnFoldAll(&swf);
-    taglist->firstTag = swf.firstTag;
-    taglist->lastTag = 0; // FIXME
-    taglist->searchTag = 0;
-    return PY_NONE;
-}
-//----------------------------------------------------------------------------
 
 //TODO: void swf_Relocate(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[a]==0 means id a is free
 
@@ -304,19 +227,6 @@ static void swf_dealloc(PyObject* self)
     PyObject_Del(self);
 }
 //----------------------------------------------------------------------------
-static void taglist_dealloc(PyObject* self)
-{
-    TagListObject*taglist = (TagListObject*)self;
-    SWF swf;
-    mylog("taglist_dealloc %08x(%d)\n", (int)self, self->ob_refcnt);
-    swf.firstTag = taglist->firstTag;
-    swf_FreeTags(&swf);
-    taglist->firstTag = 0;
-    taglist->lastTag = 0;
-    taglist->searchTag = 0;
-    PyObject_Del(self);
-}
-//----------------------------------------------------------------------------
 static int swf_print(PyObject * self, FILE *fi, int flags) //flags&Py_PRINT_RAW
 {
     SWFObject*swf = (SWFObject*)self;
@@ -402,10 +312,11 @@ static int swf_setattr(PyObject * self, char* a, PyObject * o)
 	mylog("swf_setattr %08x(%d) %s = (%d,%d,%d,%d)\n", (int)self, self->ob_refcnt, a, xmin,ymin,xmax,ymax);
 	return 0;
     } else if(!strcmp(a, "tags")) {
-	TagListObject* taglist;
+	PyObject* taglist;
 	/*if (!PyArg_Parse(o, "O!", &TagListClass, &taglist));
 	    goto err;*/
-	taglist = (TagListObject*)o;
+	// TODO: check if it's really a taglist
+	taglist = o;
 	Py_DECREF(swf->taglist);
 	swf->taglist = taglist;
 	Py_INCREF(swf->taglist);
@@ -418,358 +329,6 @@ err:
 }
 
 //----------------------------------------------------------------------------
-static PyMethodDef taglist_functions[] =
-{{"foldAll", taglist_foldAll, METH_VARARGS, "fold all sprites (movieclips) in the list"},
- {"unfoldAll", taglist_unfoldAll, METH_VARARGS, "unfold (expand) all sprites (movieclips) in the list"},
- {"optimizeOrder", taglist_optimizeOrder, METH_VARARGS, "Reorder the Tag structure"},
- {NULL, NULL, 0, NULL}
-};
-
-static PyObject* taglist_getattr(PyObject * self, char* a)
-{
-    PyObject* ret = Py_FindMethod(taglist_functions, self, a);
-    mylog("taglist_getattr %08x(%d) %s: %08x\n", (int)self, self->ob_refcnt, a, ret);
-    return ret;
-}
-//----------------------------------------------------------------------------
-static int taglist_length(PyObject * self)
-{
-    TagListObject*tags = (TagListObject*)self;
-    TAG*tag;
-    int l = 0;
-    mylog("taglist_length %08x(%d)", (int)self, self->ob_refcnt);
-    tag = tags->firstTag;
-    while(tag) {
-	l++;
-	tag = tag->next;
-    }
-    return l;
-}
-//----------------------------------------------------------------------------
-static PyObject * taglist_concat(PyObject * self, PyObject* list)
-{
-    TagObject*tag;
-    TagListObject*taglist = (TagListObject*)self;
-    mylog("taglist_concat %08x(%d) %08x", (int)self, self->ob_refcnt, list);
-	
-    if (PyArg_Parse(list, "O!", &TagClass, &tag)) {
-	/* copy tag, so we don't have to do INCREF(tag) (and don't
-	   get problems if the tag is appended to more than one
-	   taglist) */
-	/* TODO: handle IDs */
-	mylog("taglist_concat: Tag", (int)self, self->ob_refcnt);
-	taglist->lastTag = swf_InsertTag(taglist->lastTag, tag->tag->id);
-	swf_SetBlock(taglist->lastTag, tag->tag->data, tag->tag->len);
-	if(!taglist->firstTag) {
-	    taglist->firstTag = taglist->searchTag = taglist->lastTag;
-	}
-	if(swf_isDefiningTag(tag->tag)) {
-	    PyObject*id = PyLong_FromLong(taglist->currentID);
-	    PyDict_SetItem((PyObject*)(taglist->char2id), list, id);
-	    Py_INCREF(id);
-	    PyDict_SetItem((PyObject*)(taglist->id2char), id, list);
-	    Py_INCREF(id);
-	}
-	Py_INCREF(self);
-	return self;
-    }
-    PyErr_Clear();
-    if (PyList_Check(list)) {
-	int l = PyList_Size(list);
-	int t;
-	mylog("taglist_concat: PythonList", (int)self, self->ob_refcnt);
-	for(t=0;t<l;t++) {
-	    PyObject*item = PyList_GetItem(list, t);
-	    self = taglist_concat(self, item);
-	    if(!self)
-		return 0;
-	}
-	Py_INCREF(self);
-	return self;
-    }
-    PyErr_SetString(PyExc_Exception, setError("taglist concatenation only works with tags and lists (%08x).", list));
-    return 0;
-}
-//----------------------------------------------------------------------------
-staticforward TagObject* TagObject_New();
-static PyObject * taglist_item(PyObject * self, int index)
-{
-    TagListObject*taglist = (TagListObject*)self;
-    TAG*tag;
-    TagObject*tagobject;
-    int i = 0;
-    mylog("taglist_item %08x(%d) [%d]", (int)self, self->ob_refcnt, index);
-
-    if(index<0) {
-	PyErr_SetString(PyExc_Exception, setError("Negative Indices not supported."));
-	return NULL;
-    }
-
-    tag = taglist->firstTag;
-    while(tag && i<index) {
-	tag = tag->next;
-	i++;
-    }
-    if(!tag || i != index) {
-	if(index> i+10) {
-	    PyErr_SetString(PyExc_Exception, setError("No Tag at position %d", index));
-	    return NULL;
-	}
-
-	mylog("taglist_item %08x(%d)->IndexError (%d)", (int)self, self->ob_refcnt, index);
-
-	Py_INCREF(PyExc_IndexError);
-	PyErr_SetObject(PyExc_IndexError, Py_None);
-	return NULL;
-    }
-
-    tagobject = TagObject_New();
-    tagobject->tag = tag;
-
-    return (PyObject*)tagobject;
-}
-//----------------------------------------------------------------------------
-static void tag_dealloc(PyObject * self)
-{
-    TagObject*tag = (TagObject*)self;
-    mylog("tag_dealoc %08x(%d)\n", (int)self, self->ob_refcnt);
-    if(tag->placeobject) {
-	swf_PlaceObjectFree(tag->placeobject);
-	tag->placeobject = 0;
-    }
-    if(tag->font) {
-	swf_FontFree(tag->font);
-	tag->font = 0;
-    }
-    if(tag->character) {
-	Py_DECREF(tag->character);
-	tag->character = 0;
-    }
-    PyObject_Del(self);
-}
-//----------------------------------------------------------------------------
-static PyObject* tag_setU8(PyObject * self, PyObject*other)
-{
-    return NULL;
-}
-//----------------------------------------------------------------------------
-static PyObject* tag_setbackgroundcolor_getrgb(PyObject * self, PyObject*other)
-{
-    TagObject*tag = (TagObject*)self;
-    int r,g,b;
-    r = tag->tag->data[0];
-    g = tag->tag->data[1];
-    b = tag->tag->data[2];
-    return Py_BuildValue("(iii)", r,g,b);
-}
-//----------------------------------------------------------------------------
-
-static struct tagfunctions {
-    int id;
-    PyMethodDef f[8];
-} tagfunctions[] =
-{
- { 
-   ST_SETBACKGROUNDCOLOR, 
-   {{"getRGB", tag_setbackgroundcolor_getrgb, METH_VARARGS, "get's the color set by this tag"},
-    {NULL, NULL, 0, NULL}
-   }
- }
-};
-static PyMethodDef common_tagfunctions[] =
-{{"setU8", tag_setU8, METH_VARARGS, "sets a byte to the tag data"},
- {NULL, NULL, 0, NULL}
-};
-
-static PyObject* tag_getattr(PyObject * self, char* a)
-{
-    TagObject*tag = (TagObject*)self;
-    PyObject* ret = NULL;
-    int id =  tag->tag->id;
-    int t;
-   
-    /* search for a tag specific function */
-    for(t=0;t<sizeof(tagfunctions)/sizeof(tagfunctions[0]);t++)
-    {
-	if(id==tagfunctions[t].id) {
-	    mylog("tag_getattr: id %d found\n", id);
-	    ret = Py_FindMethod(tagfunctions[t].f, self, a);
-	    if(!ret) return ret;
-	    ret = FindMethodMore(ret, common_tagfunctions, self, a);
-	    mylog("tag_getattr %08x(%d) %s: %08x\n", (int)self, self->ob_refcnt, a, ret);
-	    return ret;
-	}
-    }
-   
-    ret = Py_FindMethod(common_tagfunctions, self, a);
-
-    mylog("tag_getattr %08x(%d) %s: %08x\n", (int)self, self->ob_refcnt, a, ret);
-    return ret;
-}
-//----------------------------------------------------------------------------
-//                     Tag Contructors
-//----------------------------------------------------------------------------
-static TagObject* TagObject_New()
-{
-    TagObject*tag = PyObject_New(TagObject, &TagClass);
-    tag->font = 0;
-    tag->character = 0;
-    tag->placeobject = 0;
-    tag->tag = 0;
-    return tag;
-}
-
-static PyObject* f_SetBackgroundColor(PyObject* self, PyObject* args, PyObject* kwargs)
-{
-    static char *kwlist[] = {"color", NULL};
-    int r=0,g=0,b=0;
-    TagObject*tag;
-    ColorObject*color;
-
-    /* 1st try- copy constructor */
-    if(!PyArg_ParseTupleAndKeywords(args, kwargs, "O!", kwlist, &ColorClass, &color)) {
-	/* 2nd try- color's contructor */
-	color = (ColorObject*)f_Color(NULL, args, kwargs);
-    }
-    if(!color)
-	return NULL;
-
-    tag = TagObject_New();
-    tag->tag = swf_InsertTag(0, ST_SETBACKGROUNDCOLOR);
-    swf_SetU8(tag->tag, color->rgba.r);
-    swf_SetU8(tag->tag, color->rgba.g);
-    swf_SetU8(tag->tag, color->rgba.b);
-    mylog("SetBackgroundColor(%02x,%02x,%02x) %08x -> %08x\n", color->rgba.r, color->rgba.g, color->rgba.b, (int)self, tag);
-    return (PyObject*)tag;
-}
-//----------------------------------------------------------------------------
-static PyObject* f_DefineFont(PyObject* self, PyObject* args, PyObject* kwargs)
-{
-    static char *kwlist[] = {"filename", NULL};
-    char*filename = 0;
-    TagObject*tag;
-    SWFFONT* font;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &filename))
-	return NULL;
-
-    font = swf_ReadFont(filename);
-    mylog("font=%08x",font);
-    if(!font) {
-	PyErr_SetString(PyExc_Exception, setError("Could not load %s", filename));
-	return NULL;
-    }
-
-    tag = TagObject_New();
-    tag->font = font;
-    tag->tag = swf_InsertTag(0, ST_DEFINEFONT2);
-    tag->font->id = 0xabcd; // swf_SetU16(id);
-    swf_FontSetDefine2(tag->tag, tag->font); // TODO: should this be done later, in taglist?
-    mylog("DefineFont %08x -> %08x\n", (int)self, (int)tag);
-    return (PyObject*)tag;
-}
-//----------------------------------------------------------------------------
-static PyObject* f_Protect(PyObject* self, PyObject* args, PyObject* kwargs)
-{
-    static char *kwlist[] = {"password", NULL};
-    char*password = 0;
-    TagObject*tag;
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &password))
-	return NULL;
-
-    tag = TagObject_New();
-    tag->tag = swf_InsertTag(0, ST_PROTECT);
-    if(password) {
-	swf_SetPassword(tag->tag, password);
-    }
-    mylog("f_Protect %08x -> %08x\n", (int)self, (int)tag);
-    return (PyObject*)tag;
-}
-//----------------------------------------------------------------------------
-static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs)
-{
-    static char *kwlist[] = {"font", "text", "size", "color", NULL};
-    TagObject*tag;
-    char*text = 0;
-    int textlen = 0;
-    PyObject*unicode16;
-    PyObject*unicode8;
-    int size = 0;
-    RGBA rgba = {0,0,0,255};
-    ColorObject*color = 0;
-    TagObject*font = 0;
-    SRECT r;
-    
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!u#i|O!", kwlist, &TagClass, &font, &text, &textlen, &size, &ColorClass, &color))
-	return NULL;
-    
-    unicode16 = PyUnicode_DecodeUTF16(text, textlen*2, NULL, NULL);
-    unicode8 = PyUnicode_AsUTF8String(unicode16);
-    text = PyString_AS_STRING(unicode8);
-
-    if(color)
-	rgba = color->rgba;
-
-    mylog("DefineText: text = %s", text);
-    
-    tag = TagObject_New();
-    tag ->tag= swf_InsertTag(0, ST_DEFINETEXT2);
-    swf_SetU16(tag->tag, /*ID*/0);
-    r = swf_SetDefineText(tag->tag, font->font, &rgba, text, size);
-    mylog("DefineText %08x -> %08x\n", (int)self, (int)tag);
-    return (PyObject*)tag;
-}
-//----------------------------------------------------------------------------
-static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs)
-{
-    static char *kwlist[] = {"character", "depth", "matrix", "colortransform", "ratio", "name", "clipdepth", "action", NULL};
-    TagObject*tag;
-    
-    TagObject*character = 0;
-    int depth;
-    int clipdepth = 0;
-    MatrixObject*matrix = 0;
-    CXFormObject*cxform = 0;
-    int ratio = 0;
-    ActionObject*action = 0;
-    char* name = 0;
-    SWFPLACEOBJECT* po;
-    po = malloc(sizeof(SWFPLACEOBJECT));
-    memset(po, 0, sizeof(SWFPLACEOBJECT));
-
-    swf_GetPlaceObject(0, po);
-
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i|O!O!isiO!", kwlist, 
-		&TagClass, &character, 
-		&depth, 
-		&MatrixClass, &matrix, 
-		&CXFormClass, &cxform,
-		&ratio,
-		&name,
-		&clipdepth,
-		&action
-		))
-	return NULL;
-    po->depth = depth;
-    po->id = /*ID*/ 0;
-    po->clipdepth = clipdepth;
-    po->ratio = ratio;
-    po->name = name;
-    if(clipdepth) po->matrix = matrix->matrix;
-    if(cxform) po->cxform = cxform->cxform;
-    if(action) po->actions = action->action;
-
-    tag = TagObject_New();
-    tag->placeobject = po;
-    Py_INCREF(character);
-    tag->character = (PyObject*)character;
-    tag->tag= swf_InsertTag(0, ST_PLACEOBJECT2);
-    swf_SetPlaceObject(tag->tag, po);
-    mylog("PlaceObject %08x -> %08x\n", (int)self, (int)tag);
-    return (PyObject*)tag;
-}
-//----------------------------------------------------------------------------
 static PyTypeObject SWFClass = 
 {
     PyObject_HEAD_INIT(NULL)
@@ -782,45 +341,28 @@ static PyTypeObject SWFClass =
     tp_getattr: swf_getattr,
     tp_setattr: swf_setattr,
 };
-static PySequenceMethods taglist_as_sequence =
-{
-    sq_length: taglist_length, // len(obj)
-    sq_concat: taglist_concat, // obj += [...], obj1+obj2
-    sq_repeat: 0,            // x*n, intargfunc
-    sq_item: taglist_item,  // obj[3]
-    sq_slice: 0,             // x[i:j] intintargfunc
-    sq_ass_item: 0,          // x[i] = y intobjargproc
-    sq_ass_slice: 0,         // x[i:j] = v intintobjargproc
-    sq_contains: 0,          //???
-};
-static PyTypeObject TagListClass = 
+//----------------------------------------------------------------------------
+
+static PyMethodDef SWFMethods[] = 
 {
-    PyObject_HEAD_INIT(NULL)
-    0,
-    tp_name: "TagList",
-    tp_basicsize: sizeof(TagListObject),
-    tp_itemsize: 0,
-    tp_dealloc: taglist_dealloc,
-    tp_print: 0,                 // print x
-    tp_getattr: taglist_getattr, // x.attr
-    tp_setattr: 0,               // x.attr = v
-    tp_compare: 0,               // x>y
-    tp_repr: 0,                  // `x`, print x
-    tp_as_number: 0,
-    tp_as_sequence: &taglist_as_sequence,
+    /* SWF creation*/
+    {"load", f_load, METH_VARARGS, "Load a SWF from disc."},
+    {"create", (PyCFunction)f_create, METH_KEYWORDS, "Create a new SWF from scratch."},
+    {0,0,0,0}
+    // save is a member function
 };
-static PyTypeObject TagClass = 
+PyMethodDef* swf_getMethods()
 {
-    PyObject_HEAD_INIT(NULL)
-    0,
-    tp_name: "Tag",
-    tp_basicsize: sizeof(TagObject),
-    tp_itemsize: 0,
-    tp_dealloc: tag_dealloc,
-    tp_print: 0,
-    tp_getattr: tag_getattr,
-};
-//----------------------------------------------------------------------------
+    SWFClass.ob_type = &PyType_Type;
+    return SWFMethods;
+}
+
+// =============================================================================
+
+#include "primitives.h"
+#include "action.h"
+#include "tag.h"
+#include "taglist.h"
 
 static PyObject* module_verbose(PyObject* self, PyObject* args)
 {
@@ -829,37 +371,29 @@ static PyObject* module_verbose(PyObject* self, PyObject* args)
     return Py_BuildValue("s", 0);
 }
 
-
-static PyMethodDef SWFMethods[] = 
+static PyMethodDef LoggingMethods[] = 
 {
     /* Module functions */
     {"verbose", module_verbose, METH_VARARGS, "Set the module verbosity"},
-
-    /* SWF creation*/
-    {"load", f_load, METH_VARARGS, "Load a SWF from disc."},
-    {"create", (PyCFunction)f_create, METH_KEYWORDS, "Create a new SWF from scratch."},
-    
-    /* Primitives */
-    {"Color", (PyCFunction)f_Color, METH_KEYWORDS, "Create a new color object."},
-    {"Gradient", (PyCFunction)f_Gradient, METH_KEYWORDS, "Create a new gradient object."},
-    {"ColorTransform", (PyCFunction)f_ColorTransform, METH_KEYWORDS, "Create a new colortransform object."},
-    {"Matrix", (PyCFunction)f_Matrix, METH_KEYWORDS, "Create a new matrix object."},
-    {"BBox", (PyCFunction)f_BBox, METH_KEYWORDS, "Create a new bounding box object."},
-
-    /* TAGS */
-    {"SetBackgroundColor", (PyCFunction)f_SetBackgroundColor, METH_KEYWORDS, "Create a SetBackGroundColor Tag."},
-    {"Protect", (PyCFunction)f_Protect, METH_KEYWORDS, "Create a Protect Tag."},
-    {"DefineFont", (PyCFunction)f_DefineFont, METH_KEYWORDS, "Create a DefineFont Tag."},
-    {"DefineText", (PyCFunction)f_DefineText, METH_KEYWORDS, "Create a DefineText Tag."},
-    {"PlaceObject", (PyCFunction)f_PlaceObject, METH_KEYWORDS, "Create a PlaceObject Tag."},
-    {NULL, NULL, 0, NULL}
+    {0,0,0,0}
 };
-
+    
 void initSWF(void)
 {
-    SWFClass.ob_type = &PyType_Type;
+    PyMethodDef* primitive_methods = primitive_getMethods();
+    PyMethodDef* tag_methods = tag_getMethods();
+    PyMethodDef* action_methods = action_getMethods();
+    PyMethodDef* swf_methods = swf_getMethods();
 
     initLog("test.log",8,0,0,0,0);
 
-    (void)Py_InitModule("SWF", SWFMethods);
+    PyMethodDef* all_methods = 0;
+    all_methods = addMethods(all_methods, primitive_methods);
+    all_methods = addMethods(all_methods, tag_methods);
+    all_methods = addMethods(all_methods, action_methods);
+    all_methods = addMethods(all_methods, swf_methods);
+
+    all_methods = addMethods(all_methods, LoggingMethods);
+
+    (void)Py_InitModule("SWF", all_methods);
 }