X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2FSWF.c;h=3bb744a8ef8dea1aafa9ff6da55c8fe94fc9ba0a;hb=89bf852c497d296477ac788f00a06b11e5502fa9;hp=e01184126d482798225815872414390bec2653da;hpb=726d172d02228a2e9b084efba8d3173994343c2b;p=swftools.git

diff --git a/lib/python/SWF.c b/lib/python/SWF.c
index e011841..3bb744a 100644
--- a/lib/python/SWF.c
+++ b/lib/python/SWF.c
@@ -25,8 +25,10 @@
 #include "../rfxswf.h"
 #include "../log.h"
 #include "./pyutils.h"
-#include "./tag.h"
+#include "./tags.h"
 #include "./taglist.h"
+#include "./primitives.h"
+#include "./action.h"
 
 /*
 TODO:
@@ -69,11 +71,17 @@ static PyObject* f_create(PyObject* self, PyObject* args, PyObject* kwargs)
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|idOs", 
 		kwlist, &version, &framerate, 
-		&obbox, filename))
+		&obbox, &filename))
 	return NULL;
 
-    if (!PyArg_Parse(obbox, "(iiii)", &bbox.xmin, &bbox.ymin, &bbox.xmax, &bbox.ymax))
-	return NULL;
+    if(obbox) {
+	if (!PY_CHECK_TYPE(obbox, &BBoxClass)) {
+	    obbox = f_BBox(0, obbox, 0);
+	    if(!obbox)
+		return NULL;
+	}
+	bbox = bbox_getSRECT(obbox);
+    }
 
     memset(&swf->swf, 0, sizeof(SWF));
     if(filename)
@@ -103,13 +111,15 @@ static PyObject* f_load(PyObject* self, PyObject* args)
 	return NULL;
 
     swf = PyObject_New(SWFObject, &SWFClass);
+    mylog("+%08x(%d) f_load\n", (int)swf, swf->ob_refcnt);
+
     memset(&swf->swf, 0, sizeof(SWF));
-    swf->filename = strdup(filename);
 
     if(!filename) {
 	PyErr_SetString(PyExc_Exception, setError("Couldn't open file %s", filename));
         return 0;
     }
+    swf->filename = strdup(filename);
     fi = open(filename,O_RDONLY|O_BINARY);
     if (fi<0) { 
         PyErr_SetString(PyExc_Exception, setError("Couldn't open file %s", filename));
@@ -121,11 +131,16 @@ static PyObject* f_load(PyObject* self, PyObject* args)
 	return 0;
     }
     close(fi);
-    swf->swf.firstTag = 0;
+    swf_FoldAll(&swf->swf);
 
     swf->taglist = taglist_new2(swf->swf.firstTag);
+    if(swf->taglist == NULL) {
+	return NULL;
+    }
+    
+    swf_FreeTags(&swf->swf);
+    swf->swf.firstTag = 0;
     
-    mylog("+%08x(%d) load\n", (int)self, self->ob_refcnt);
     return (PyObject*)swf;
 }
 //----------------------------------------------------------------------------
@@ -137,7 +152,7 @@ static PyObject * swf_save(PyObject* self, PyObject* args, PyObject* kwargs)
     int fi;
     char*filename = 0;
     int compress = 0;
-
+    
     if(!self)
 	return NULL;
 
@@ -148,6 +163,8 @@ static PyObject * swf_save(PyObject* self, PyObject* args, PyObject* kwargs)
 
     if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|si", kwlist, &filename, &compress))
 	return NULL;
+    
+    mylog(" %08x(%d) f_save filename=%s compress=%d\n", (int)self, self->ob_refcnt, filename, compress);
 
     // keyword arg compress (=1) forces compression
     if(compress)
@@ -155,13 +172,17 @@ static PyObject * swf_save(PyObject* self, PyObject* args, PyObject* kwargs)
     
     swf->firstTag = taglist_getTAGs(swfo->taglist);
 
+    /*if(!swf->firstTag)
+	return NULL;*/
+
     // fix the file, in case it is empty or not terminated properly
     {
 	TAG*tag = swf->firstTag;
 	if(!tag)
 	    tag = swf->firstTag = swf_InsertTag(0,ST_END);
-	while(tag && tag->next)
+	while(tag && tag->next) {
 	    tag = tag->next;
+	}
 	if(tag->id != ST_END) {
 	    tag = swf_InsertTag(tag,ST_END);
 	}
@@ -186,9 +207,27 @@ static PyObject * swf_save(PyObject* self, PyObject* args, PyObject* kwargs)
 	    }
     }
     close(fi);
-    
+
+    swf_FreeTags(swf);
+    /*{ TAG * t = swf->firstTag;
+      while (t)
+      { 
+	mylog("tag: %08x\n",t);
+	mylog("  id: %d (%s)\n", t->id, swf_TagGetName(t));
+	mylog("  data: %08x (%d bytes)\n", t->data, t->len);
+	mylog("  next: %08x\n", t->next);
+	TAG * tnew = t->next;
+	mylog("->free data\n");
+	if (t->data) free(t->data);
+	mylog("->free tag\n");
+	free(t);
+	t = tnew;
+      }
+    }*/
     swf->firstTag = 0;
     
+    mylog(" %08x(%d) f_save filename=%s done\n", (int)self, self->ob_refcnt, filename);
+    
     return PY_NONE;
 }
 //----------------------------------------------------------------------------
@@ -198,7 +237,10 @@ static PyObject * swf_writeCGI(PyObject* self, PyObject* args)
     if(!self || !PyArg_ParseTuple(args,"")) 
 	return NULL;
     swf->swf.firstTag = taglist_getTAGs(swf->taglist);
+    if(!swf->swf.firstTag)
+	return NULL;
     swf_WriteCGI(&swf->swf);
+    swf_FreeTags(&swf->swf);
     swf->swf.firstTag = 0;
     return PY_NONE;
 }
@@ -241,7 +283,7 @@ static int swf_print(PyObject * self, FILE *fi, int flags) //flags&Py_PRINT_RAW
 static PyObject* swf_getattr(PyObject * self, char* a)
 {
     SWFObject*swf = (SWFObject*)self;
-    PyObject* ret;
+    PyObject* ret = 0;
 
     if(!strcmp(a, "fps")) {
 	double fps = swf->swf.frameRate/256.0;
@@ -256,13 +298,7 @@ static PyObject* swf_getattr(PyObject * self, char* a)
 	mylog(" %08x(%d) swf_getattr %s = %s\n", (int)self, self->ob_refcnt, a, filename);
 	return Py_BuildValue("s", filename);
     } else if(!strcmp(a, "bbox")) {
-	int xmin,ymin,xmax,ymax;
-	xmin = swf->swf.movieSize.xmin;
-	ymin = swf->swf.movieSize.ymin;
-	xmax = swf->swf.movieSize.xmax;
-	ymax = swf->swf.movieSize.ymax;
-	mylog(" %08x(%d) swf_getattr %s = (%d,%d,%d,%d)\n", (int)self, self->ob_refcnt, a, xmin,ymin,xmax,ymax);
-	return Py_BuildValue("(iiii)", xmin, ymin, xmax, ymax); 
+	return f_BBox2(swf->swf.movieSize);
     } else if(!strcmp(a, "tags")) {
 	PyObject*ret =  (PyObject*)(swf->taglist);
 	Py_INCREF(ret);
@@ -303,22 +339,21 @@ static int swf_setattr(PyObject * self, char* a, PyObject * o)
 	mylog(" %08x(%d) swf_setattr %s = %s\n", (int)self, self->ob_refcnt, a, filename);
 	return 0;
     } else if(!strcmp(a, "bbox")) {
-	int xmin=0,ymin=0,xmax=0,ymax=0;
-	if (!PyArg_Parse(o, "(iiii)", &xmin, &ymin, &xmax, &ymax)) 
-	    goto err;
+	PyObject *obbox = o;
+	if (!PY_CHECK_TYPE(obbox, &BBoxClass)) {
+	    obbox = f_BBox(0, o, 0);
+	    if(!obbox)
+		return 1;
+	}
+	SRECT bbox = bbox_getSRECT(obbox);
 
-	swf->swf.movieSize.xmin = xmin;
-	swf->swf.movieSize.ymin = ymin;
-	swf->swf.movieSize.xmax = xmax;
-	swf->swf.movieSize.ymax = ymax;
-	mylog(" %08x(%d) swf_setattr %s = (%d,%d,%d,%d)\n", (int)self, self->ob_refcnt, a, xmin,ymin,xmax,ymax);
+	swf->swf.movieSize = bbox;
+	mylog(" %08x(%d) swf_setattr %s = (%d,%d,%d,%d)\n", (int)self, self->ob_refcnt, a, bbox.xmin,bbox.ymin,bbox.xmax,bbox.ymax);
 	return 0;
     } else if(!strcmp(a, "tags")) {
 	PyObject* taglist;
-	/*if (!PyArg_Parse(o, "O!", &TagListClass, &taglist));
-	    goto err;*/
-	// TODO: check if it's really a taglist
 	taglist = o;
+	PY_ASSERT_TYPE(taglist,&TagListClass);
 	Py_DECREF(swf->taglist);
 	swf->taglist = taglist;
 	Py_INCREF(swf->taglist);
@@ -370,7 +405,7 @@ static PyObject* module_verbose(PyObject* self, PyObject* args, PyObject* kwargs
 {
     int _verbose = 0;
     static char *kwlist[] = {"verbosity", NULL};
-    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &verbose))
+    if (!PyArg_ParseTupleAndKeywords(args, kwargs, "i", kwlist, &_verbose))
 	return NULL;
     setVerbosity(_verbose);
 
@@ -383,12 +418,12 @@ static PyMethodDef LoggingMethods[] =
     {"verbose", (PyCFunction)module_verbose, METH_KEYWORDS, "Set the module verbosity"},
     {0,0,0,0}
 };
-    
+
 void initSWF(void)
 {
     PyObject*module;
     PyMethodDef* primitive_methods = primitive_getMethods();
-    PyMethodDef* tag_methods = tag_getMethods();
+    PyMethodDef* tag_methods = tags_getMethods();
     PyMethodDef* action_methods = action_getMethods();
     PyMethodDef* swf_methods = swf_getMethods();
 
@@ -401,4 +436,9 @@ void initSWF(void)
     all_methods = addMethods(all_methods, LoggingMethods);
 
     module = Py_InitModule("SWF", all_methods);
+
+    /* Python doesn't copy the PyMethodDef struct, so we need
+       to keep it around */
+    // free(all_methods) 
 }
+