From cef2964cf28d0ad7fd063a6401f198b16ca9fa47 Mon Sep 17 00:00:00 2001 From: kramm Date: Thu, 8 Apr 2004 19:40:14 +0000 Subject: [PATCH] tag-specific attributes/functions are now accessed via a generic struct --- lib/python/tag.c | 629 ++++++++++++++++++++++++++++++++++-------------------- 1 file changed, 403 insertions(+), 226 deletions(-) diff --git a/lib/python/tag.c b/lib/python/tag.c index 65e19b3..9d69de2 100644 --- a/lib/python/tag.c +++ b/lib/python/tag.c @@ -9,170 +9,200 @@ #include "tagmap.h" //---------------------------------------------------------------------------- -typedef struct { + +struct _TagObject; + +typedef struct _tag_internals +{ + int size; + int (*parse)(struct _TagObject*); + int (*fillTAG)(struct _TagObject*); + void (*dealloc)(struct _TagObject*); + void*data; + PyMethodDef* tagfunctions; +} tag_internals_t; + +typedef struct _TagObject { PyObject_HEAD + PyObject* tagmap; TAG*tag; - /* ST_DEFINEFONT*/ - SWFFONT* font; - /* ST_PLACEOBJECT, ST_PLACEOBJECT2*/ - SWFPLACEOBJECT* placeobject; - PyObject* character; + tag_internals_t internals; } TagObject; //---------------------------------------------------------------------------- -static void tag_dealloc(PyObject * self) + +PyObject* tag_new(tag_internals_t*tag_internals); + +typedef struct _font_internal { - TagObject*tag = (TagObject*)self; - if(tag->tag) - mylog("-%08x(%d) tag_dealoc [%s]\n", (int)self, self->ob_refcnt, swf_TagGetName(tag->tag)); - else - mylog("-%08x(%d) tag_dealoc [?]\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; - } - if(tag->tag) { - swf_DeleteTag(tag->tag); - tag->tag = 0; + SWFFONT* font; +} font_internal_t; +staticforward tag_internals_t font_tag; + +static int font_parse(TagObject*self) +{ + font_internal_t*font = (font_internal_t*)self->internals.data; + /* TODO */ + PyErr_SetString(PyExc_Exception, setError("Font parsing not implemented yet")); + return 0; +} +static void font_dealloc(TagObject*self) +{ + font_internal_t*font = (font_internal_t*)self->internals.data; + if(font->font) { + swf_FontFree(font->font); + font->font = 0; } - Py_DECREF(tag->tagmap); - tag->tagmap = 0; - PyObject_Del(self); } -//---------------------------------------------------------------------------- -static PyObject* tag_setU8(PyObject * self, PyObject*other) +static int font_fillTAG(TagObject*self) { - return NULL; + font_internal_t*fi = (font_internal_t*)self->internals.data; + if(self->tag) + return 1; + self->tag = swf_InsertTag(0, ST_DEFINEFONT2); + swf_FontSetDefine2(self->tag, fi->font); + return 1; } -//---------------------------------------------------------------------------- -static PyObject* tag_setbackgroundcolor_getrgb(PyObject * self, PyObject*other) +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_LoadFont(filename); + if(!font) { + PyErr_SetString(PyExc_Exception, setError("Could not load %s", filename)); + return NULL; + } + + tag = (TagObject*)tag_new(&font_tag); + font_internal_t*fi = (font_internal_t*)tag->internals.data; + font->id = 0; + fi->font = font; + return (PyObject*)tag; +} +static SWFFONT* font_getSWFFONT(PyObject*self) { + PY_ASSERT_TYPE(self, &TagClass); 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); + font_internal_t*fi = (font_internal_t*)tag->internals.data; + return fi->font; } -//---------------------------------------------------------------------------- - -static struct tagfunctions { - int id; - PyMethodDef f[8]; -} tagfunctions[] = +static tag_internals_t font_tag = { - { - 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} + size: sizeof(font_internal_t), + parse: font_parse, + fillTAG: font_fillTAG, + dealloc: font_dealloc, + tagfunctions: 0 }; +//---------------------------------------------------------------------------- -static PyObject* tag_getattr(PyObject * self, char* a) +typedef struct _placeobject_internal { - TagObject*tag = (TagObject*)self; - PyObject* ret = NULL; - int id = tag->tag->id; - int t; + SWFPLACEOBJECT* po; +} placeobject_internal_t; +staticforward tag_internals_t placeobject_tag; - /* -- fields -- */ - if(!strcmp(a, "id")) { - return Py_BuildValue("i", id); - } - if(!strcmp(a, "name")) { - char* name = swf_TagGetName(tag->tag); - return Py_BuildValue("s", name); - } -/* if(!strcmp(a, "swf")) { - if(tag->swf == 0) - return Py_BuildValue("s", 0); - else { - Py_INCREF(tag->swf); - return tag->swf; - } - }*/ - /* ------------ */ - - /* search for a tag specific function */ - for(t=0;tob_refcnt, id); - ret = Py_FindMethod(tagfunctions[t].f, self, a); - if(!ret) return ret; - ret = FindMethodMore(ret, common_tagfunctions, self, a); - mylog(" %08x(%d) tag_getattr %s: %08x\n", (int)self, self->ob_refcnt, a, ret); - return ret; - } +static void po_dealloc(TagObject*self) +{ + placeobject_internal_t*pi = (placeobject_internal_t*)self->internals.data; + if(pi->po) { + swf_PlaceObjectFree(pi->po); + pi->po = 0; } - - ret = Py_FindMethod(common_tagfunctions, self, a); - - mylog(" %08x(%d) tag_getattr %s: %08x\n", (int)self, self->ob_refcnt, a, ret); - return ret; } -//---------------------------------------------------------------------------- -// Tag Contructors -//---------------------------------------------------------------------------- -PyObject* tag_new() +static int po_parse(TagObject*self) { - TagObject*tag = PyObject_New(TagObject, &TagClass); - mylog("+%08x(%d) tag_new\n", (int)tag, tag->ob_refcnt); - tag->font = 0; - tag->character = 0; - tag->placeobject = 0; - tag->tag = 0; - tag->tagmap = tagmap_new(); - return (PyObject*)tag; + placeobject_internal_t*pi = (placeobject_internal_t*)self->internals.data; + /* TODO */ + PyErr_SetString(PyExc_Exception, setError("Font parsing not implemented yet")); + return 0; } -PyObject* tag_new2(TAG*t, PyObject* tagmap) +static int po_fillTAG(TagObject*self) { - TagObject*tag = PyObject_New(TagObject, &TagClass); - mylog("+%08x(%d) tag_new2 tag=%08x id=%d (%s)\n", (int)tag, tag->ob_refcnt, t, t->id, swf_TagGetName(t)); - tag->font = 0; - tag->character = 0; - tag->placeobject = 0; - tag->tagmap = tagmap_new(); - // copy tag - tag->tag = swf_InsertTag(0, t->id); - swf_SetBlock(tag->tag, t->data, t->len); - t = tag->tag; + placeobject_internal_t*pi = (placeobject_internal_t*)self->internals.data; + self->tag = swf_InsertTag(0, ST_PLACEOBJECT2); + swf_SetPlaceObject(self->tag, pi->po); + return 1; +} +static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs) +{ + static char *kwlist[] = {"character", "depth", "matrix", "colortransform", "ratio", "name", "clipdepth", "action", NULL}; + TagObject*tag; - int num = swf_GetNumUsedIDs(t); - if(num) { // tag has dependencies - int * positions = malloc(num*sizeof(int)); - swf_GetUsedIDs(t, positions); - int i; - for(i=0;idata[positions[i]]); - PyObject*obj = tagmap_id2obj(tagmap, id); - if(obj==NULL) { - PyErr_SetString(PyExc_Exception, setError("TagID %d not defined", id)); - return NULL; - } - //mylog("+%08x(%d) tag_new2 handling id %d at %d/%d\n", (int)tag, tag->ob_refcnt, id, positions[i], t->len); - //mylog("+%08x(%d) tag_new2 add dependency %d to id %d, object %08x(%d)\n", (int)tag, tag->ob_refcnt, i, id, obj, obj->ob_refcnt); - tagmap_addMapping(tag->tagmap, id, obj); - } - free(positions); - } + TagObject*character = 0; + int depth; + int clipdepth = 0; + PyObject*matrix = 0; + PyObject*cxform = 0; + PyObject*action = 0; + int ratio = 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, + &ActionClass, &action + )) + return NULL; + po->depth = depth; + po->id = /*ID*/ 0; + po->clipdepth = clipdepth; + po->ratio = ratio; + po->name = name; + if(clipdepth) po->clipdepth = clipdepth; + if(matrix) po->matrix = matrix_getMatrix(matrix); + if(cxform) po->cxform = colortransform_getCXForm(cxform); + if(action) po->actions = action_getAction(action); + + tag = (TagObject*)tag_new(&placeobject_tag); + placeobject_internal_t*pi = (placeobject_internal_t*)tag->internals.data; + pi->po = po; + pi->po->id = tagmap_add(tag->tagmap,(PyObject*)character); + + mylog("+%08x(%d) PlaceObject %08x(%d)\n", (int)tag, tag->ob_refcnt, character, character->ob_refcnt); + return (PyObject*)tag; } - +static tag_internals_t placeobject_tag = +{ + size: sizeof(placeobject_internal_t), + parse: po_parse, + fillTAG: po_fillTAG, + dealloc: po_dealloc, + tagfunctions: 0 +}; +//---------------------------------------------------------------------------- +staticforward tag_internals_t bgcolor_tag; +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 PyMethodDef setbgcolor_methods[] = +{{"getRGB", tag_setbackgroundcolor_getrgb, METH_VARARGS, "get's the color set by this tag"}, + {NULL, NULL, 0, NULL} +}; static PyObject* f_SetBackgroundColor(PyObject* self, PyObject* args, PyObject* kwargs) { static char *kwlist[] = {"color", NULL}; @@ -180,7 +210,7 @@ static PyObject* f_SetBackgroundColor(PyObject* self, PyObject* args, PyObject* TagObject*tag; PyObject*color; - tag = (TagObject*)tag_new(); + tag = (TagObject*)tag_new(&bgcolor_tag); /* 1st try- copy constructor */ if(!PyArg_ParseTupleAndKeywords(args, kwargs, "O!", kwlist, &ColorClass, &color)) { @@ -198,48 +228,25 @@ static PyObject* f_SetBackgroundColor(PyObject* self, PyObject* args, PyObject* mylog(" %08x(%d) SetBackgroundColor(%02x,%02x,%02x) (colorobj=%08x(%d))\n", (int)tag, tag->ob_refcnt, rgba.r, rgba.g, rgba.b, color, color->ob_refcnt); return (PyObject*)tag; } -//---------------------------------------------------------------------------- -static PyObject* f_DefineFont(PyObject* self, PyObject* args, PyObject* kwargs) +static tag_internals_t bgcolor_tag = { - static char *kwlist[] = {"filename", NULL}; - char*filename = 0; - TagObject*tag; - SWFFONT* font; - - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|s", kwlist, &filename)) - return NULL; - - font = swf_LoadFont(filename); - if(!font) { - PyErr_SetString(PyExc_Exception, setError("Could not load %s", filename)); - return NULL; - } - - tag = (TagObject*)tag_new(); - tag->font = font; - tag->tag = swf_InsertTag(0, ST_DEFINEFONT2); - tag->font->id = 0; - swf_FontSetDefine2(tag->tag, tag->font); - mylog("+%08x(%d) DefineFont\n", (int)tag, tag->ob_refcnt); - return (PyObject*)tag; -} -static SWFFONT* fonttag_getSWFFONT(PyObject*self) -{ - PY_ASSERT_TYPE(self, &TagClass); - TagObject*font = (TagObject*)self; - return font->font; -} + size: 0, + parse: 0, + fillTAG: 0, + dealloc: 0, + tagfunctions: setbgcolor_methods +}; //---------------------------------------------------------------------------- +staticforward tag_internals_t protect_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*)tag_new(); + TagObject*tag = (TagObject*)tag_new(&protect_tag); tag->tag = swf_InsertTag(0, ST_PROTECT); if(password) { swf_SetPassword(tag->tag, password); @@ -247,7 +254,35 @@ static PyObject* f_Protect(PyObject* self, PyObject* args, PyObject* kwargs) mylog("+%08x(%d) f_Protect", (int)tag, tag->ob_refcnt); return (PyObject*)tag; } +static tag_internals_t protect_tag = +{ + size: 0, + parse: 0, + fillTAG: 0, + dealloc: 0, + tagfunctions: 0 +}; //---------------------------------------------------------------------------- +staticforward tag_internals_t text_tag; + +typedef struct _text_internal // not used yet +{ + int font_id; + char*text; + SWFFONT* swffont; + RGBA rgba; + int size; +} text_internal_t; +staticforward tag_internals_t placeobject_tag; + +static int text_fillTAG(TagObject*self) //not used yet +{ + text_internal_t*ti = (text_internal_t*)self->internals.data; + self->tag= swf_InsertTag(0, ST_DEFINETEXT2); + swf_SetU16(self->tag, /*ID*/0); + SRECT r = swf_SetDefineText(self->tag, ti->swffont, &ti->rgba, ti->text, ti->size); + return 0; +} static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs) { static char *kwlist[] = {"font", "text", "size", "color", NULL}; @@ -274,15 +309,17 @@ static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs) mylog("DefineText: text = %s", text); - tag = (TagObject*)tag_new(); + tag = (TagObject*)tag_new(&text_tag); + text_internal_t*ti = (text_internal_t*)tag->internals.data; + SWFFONT* swffont = font_getSWFFONT(font); int font_id = tagmap_add(tag->tagmap, font); // add dependency on font + swffont->id = font_id; // for swf_SetDefineText - fonttag_getSWFFONT(font)->id = font_id; - - tag ->tag= swf_InsertTag(0, ST_DEFINETEXT2); + /* todo: remove, store data in ti */ + tag->tag= swf_InsertTag(0, ST_DEFINETEXT2); swf_SetU16(tag->tag, /*ID*/0); - r = swf_SetDefineText(tag->tag, fonttag_getSWFFONT(font), &rgba, text, size); + r = swf_SetDefineText(tag->tag, swffont, &rgba, text, size); mylog("+%08x(%d) DefineText tag=%08x \n", (int)tag, tag->ob_refcnt); //Py_DECREF(unicode16); @@ -291,66 +328,205 @@ static PyObject* f_DefineText(PyObject* self, PyObject* args, PyObject* kwargs) return (PyObject*)tag; } +static tag_internals_t text_tag = +{ + size: sizeof(text_internal_t), + parse: 0, + fillTAG: text_fillTAG, + dealloc: 0, + tagfunctions: 0 +}; //---------------------------------------------------------------------------- -static PyObject* f_PlaceObject(PyObject* self, PyObject* args, PyObject* kwargs) +static PyMethodDef generic_methods[] = { - static char *kwlist[] = {"character", "depth", "matrix", "colortransform", "ratio", "name", "clipdepth", "action", NULL}; - TagObject*tag; - - TagObject*character = 0; - int depth; - int clipdepth = 0; - PyObject*matrix = 0; - PyObject*cxform = 0; - PyObject*action = 0; - int ratio = 0; - char* name = 0; - SWFPLACEOBJECT* po; - po = malloc(sizeof(SWFPLACEOBJECT)); - memset(po, 0, sizeof(SWFPLACEOBJECT)); - - swf_GetPlaceObject(0, po); + {NULL, NULL, 0, NULL} +}; +static tag_internals_t generic_tag = +{ + size: 0, + parse: 0, + dealloc: 0, + fillTAG: 0, + tagfunctions: generic_methods +}; +//---------------------------------------------------------------------------- - if (!PyArg_ParseTupleAndKeywords(args, kwargs, "O!i|O!O!isiO!", kwlist, - &TagClass, &character, - &depth, - &MatrixClass, &matrix, - &CXFormClass, &cxform, - &ratio, - &name, - &clipdepth, - &ActionClass, &action - )) - return NULL; - po->depth = depth; - po->id = /*ID*/ 0; - po->clipdepth = clipdepth; - po->ratio = ratio; - po->name = name; - if(clipdepth) po->clipdepth = clipdepth; - if(matrix) po->matrix = matrix_getMatrix(matrix); - if(cxform) po->cxform = colortransform_getCXForm(cxform); - if(action) po->actions = action_getAction(action); +struct tag_parser { + int id; + tag_internals_t*spec; +} tag_parsers[] = { + {ST_PLACEOBJECT,&placeobject_tag}, + {ST_PLACEOBJECT2,&placeobject_tag}, + {ST_SETBACKGROUNDCOLOR,&bgcolor_tag}, + {ST_DEFINEFONT,&font_tag}, + {ST_PROTECT,&protect_tag}, + {ST_DEFINETEXT,&text_tag}, + {-1,0} +}; +//---------------------------------------------------------------------------- +static void tag_dealloc(PyObject * self) +{ + TagObject*tag = (TagObject*)self; + if(tag->tag) + mylog("-%08x(%d) tag_dealoc [%s]\n", (int)self, self->ob_refcnt, swf_TagGetName(tag->tag)); + else + mylog("-%08x(%d) tag_dealoc [?]\n", (int)self, self->ob_refcnt); + if(tag->internals.dealloc) { + if(!tag->internals.data) + mylog("-%08x(%d) tag_dealoc: Warning: calling dealloc without any data(?)\n", (int)self, self->ob_refcnt); + tag->internals.dealloc(tag); + } + if(tag->internals.data) { + free(tag->internals.data); + tag->internals.data = 0; + } + if(tag->tag) { + swf_DeleteTag(tag->tag); + tag->tag = 0; + } + Py_DECREF(tag->tagmap); + tag->tagmap = 0; + PyObject_Del(self); +} +//---------------------------------------------------------------------------- +static PyObject* tag_setU8(PyObject * self, PyObject*other) +{ + return NULL; +} +//---------------------------------------------------------------------------- +static PyMethodDef common_tagfunctions[] = +{{"setU8", tag_setU8, METH_VARARGS, "sets a byte to the tag data"}, + {NULL, NULL, 0, NULL} +}; - tag = (TagObject*)tag_new(); - tag->placeobject = po; - Py_INCREF(character); - tag->character = (PyObject*)character; - tag->tag= swf_InsertTag(0, ST_PLACEOBJECT2); +static int fillTAG(PyObject*self) +{ + TagObject*tag = (TagObject*)self; + if(tag->tag) + return 1; + if(!tag->internals.fillTAG) { + PyErr_SetString(PyExc_Exception, setError("No way to fill TAG with data")); + return 0; + } + if(!tag->internals.fillTAG(tag)) { + return 0; // pass through exception + } + if(!tag->tag) { + PyErr_SetString(PyExc_Exception, setError("Couldn't fill tag")); + return 0; + } + return 1; +} +static PyObject* tag_getattr(PyObject * self, char* a) +{ + TagObject*tag = (TagObject*)self; + PyObject* ret = NULL; + int t; - po->id = tagmap_add(tag->tagmap,(PyObject*)character); + /* -- fields -- */ + if(!strcmp(a, "id")) { + if(!fillTAG(self)) + return 0; + return Py_BuildValue("i", tag->tag->id); + } + if(!strcmp(a, "name")) { + if(!fillTAG(self)) + return 0; + char* name = swf_TagGetName(tag->tag); + return Py_BuildValue("s", name); + } + + /* search for a tag specific function */ + if(tag->internals.tagfunctions) { + mylog(" %08x(%d) tag_getattr: tag has specific functions\n", (int)self, self->ob_refcnt); + ret = Py_FindMethod(tag->internals.tagfunctions, self, a); + if(!ret) return ret; + ret = FindMethodMore(ret, common_tagfunctions, self, a); + mylog(" %08x(%d) tag_getattr %s: %08x\n", (int)self, self->ob_refcnt, a, ret); + return ret; + } + + ret = Py_FindMethod(common_tagfunctions, self, a); - swf_SetPlaceObject(tag->tag, po); - mylog("+%08x(%d) PlaceObject %08x(%d)\n", (int)tag, tag->ob_refcnt, character, character->ob_refcnt); + mylog(" %08x(%d) tag_getattr %s: %08x\n", (int)self, self->ob_refcnt, a, ret); + return ret; +} +//---------------------------------------------------------------------------- +// Tag Constructors +//---------------------------------------------------------------------------- +PyObject* tag_new(tag_internals_t*tag_internals) +{ + TagObject*tag = PyObject_New(TagObject, &TagClass); + mylog("+%08x(%d) tag_new\n", (int)tag, tag->ob_refcnt); + memcpy(&tag->internals, tag_internals, sizeof(tag_internals_t)); + if(tag->internals.size) { + tag->internals.data = malloc(tag->internals.size); + memset(tag->internals.data , 0, tag->internals.size); + } else { + tag->internals.data = 0; + } + tag->tag = 0; + tag->tagmap = tagmap_new(); return (PyObject*)tag; } +PyObject* tag_new2(TAG*t, PyObject* tagmap) +{ + TagObject*tag = PyObject_New(TagObject, &TagClass); + mylog("+%08x(%d) tag_new2 tag=%08x id=%d (%s)\n", (int)tag, tag->ob_refcnt, t, t->id, swf_TagGetName(t)); + + tag->tagmap = tagmap_new(); + + int num = swf_GetNumUsedIDs(t); + if(num) { // tag has dependencies + int * positions = malloc(num*sizeof(int)); + swf_GetUsedIDs(t, positions); + int i; + for(i=0;idata[positions[i]]); + PyObject*obj = tagmap_id2obj(tagmap, id); + if(obj==NULL) { + PyErr_SetString(PyExc_Exception, setError("TagID %d not defined", id)); + return NULL; + } + //mylog("+%08x(%d) tag_new2 handling id %d at %d/%d\n", (int)tag, tag->ob_refcnt, id, positions[i], t->len); + //mylog("+%08x(%d) tag_new2 add dependency %d to id %d, object %08x(%d)\n", (int)tag, tag->ob_refcnt, i, id, obj, obj->ob_refcnt); + tagmap_addMapping(tag->tagmap, id, obj); + } + free(positions); + } + tag->tag = swf_InsertTag(0, t->id); + swf_SetBlock(tag->tag, t->data, t->len); + + int i=0,found=0; + while(tag_parsers[i].id>=0) { + if(tag_parsers[i].id == t->id) { + memcpy(&tag->internals, tag_parsers[i].spec, sizeof(tag_internals_t)); + found=1; + break; + } + i++; + } + if(!found) { + memcpy(&tag->internals, &generic_tag, sizeof(tag_internals_t)); + } + if(tag->internals.size) { + tag->internals.data = malloc(tag->internals.size); + memset(tag->internals.data, 0, tag->internals.size); + } else { + tag->internals.data = 0; + } + return (PyObject*)tag; +} +//---------------------------------------------------------------------------- /* serialize */ TAG* tag_getTAG(PyObject*self, TAG*prevTag, PyObject*tagmap) { TagObject*tag = (TagObject*)self; - + + if(!fillTAG(self)) + return 0; mylog(" %08x(%d) tag_getTAG: tag=%08x id=%d (%s)", (int)self, self->ob_refcnt, tag->tag, tag->tag->id, swf_TagGetName(tag->tag)); TAG* t = swf_InsertTag(prevTag, tag->tag->id); @@ -381,20 +557,21 @@ TAG* tag_getTAG(PyObject*self, TAG*prevTag, PyObject*tagmap) } return t; } - PyObject* tag_getDependencies(PyObject*self) { TagObject*tag = (TagObject*)self; - mylog(" %08x(%d) tag_getDependencies id=%d tag=%s\n", (int)self, self->ob_refcnt, tag->tag->id, swf_TagGetName(tag->tag)); + mylog(" %08x(%d) tag_getDependencies\n", (int)self, self->ob_refcnt); return tagmap_getObjectList(tag->tagmap); } - -int tag_print (PyObject * self, FILE * fi, int flags) +int tag_print(PyObject * self, FILE * fi, int flags) { + TagObject*tag = (TagObject*)self; mylog(" %08x(%d) tag_print flags=%08x\n", (int)self, self->ob_refcnt, flags); + if(!fillTAG(self)) + return -1; + fprintf(fi, "tag-%08x-%d-%s", (int)tag->tag, tag->tag->id, swf_TagGetName(tag->tag)); return 0; } - PyTypeObject TagClass = { PyObject_HEAD_INIT(NULL) -- 1.7.10.4