X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Fpython%2Ftaglist.c;h=e16f84a0b96a48f042d64043c0968dca950cfd68;hb=2eeb45c3b0d4bff224b63f94edcef38853663755;hp=27b3a6662ea48777cbf9bb7582ce40e1bedf417a;hpb=726d172d02228a2e9b084efba8d3173994343c2b;p=swftools.git

diff --git a/lib/python/taglist.c b/lib/python/taglist.c
index 27b3a66..e16f84a 100644
--- a/lib/python/taglist.c
+++ b/lib/python/taglist.c
@@ -19,7 +19,7 @@ typedef struct {
 PyObject * taglist_new()
 {
     TagListObject* taglist = PyObject_New(TagListObject, &TagListClass);
-    mylog("+%08x(%d) taglist_new2", (int)taglist, taglist->ob_refcnt);
+    mylog("+%08x(%d) taglist_new", (int)taglist, taglist->ob_refcnt);
     taglist->tagmap = tagmap_new();
     taglist->taglist = PyList_New(0);
     return (PyObject*)taglist;
@@ -28,21 +28,35 @@ PyObject * taglist_new()
 PyObject * taglist_new2(TAG*tag)
 {
     TagListObject* taglist = PyObject_New(TagListObject, &TagListClass);
-    mylog("+%08x(%d) taglist_new2", (int)taglist, taglist->ob_refcnt);
+    mylog("+%08x(%d) taglist_new2 tag=%08x", (int)taglist, taglist->ob_refcnt, tag);
     taglist->tagmap = tagmap_new();
 
     int nr=0;
     TAG*t = tag;
-    while(t) {nr++;t=t->next;}
+    TAG*last = t;
+    while(t) {nr++;last=t;t=t->next;}
+
+    if(last && last->id==ST_END) {
+	swf_DeleteTag(last);
+	nr--;
+    }
+
     taglist->taglist = PyList_New(nr);
+    
+    mylog("+%08x(%d) taglist_new2: %d items", (int)taglist, taglist->ob_refcnt, nr);
 
     nr = 0;
     t = tag;
     while(t) {
-	PyObject*newtag = tag_new(tag);
+	PyObject*newtag = tag_new2(t, taglist->tagmap);
+	if(newtag==NULL) {
+	    // pass through exception
+	    return NULL;
+	}
 	PyList_SET_ITEM(taglist->taglist,nr,newtag);Py_INCREF(newtag);
 	if(swf_isDefiningTag(t)) {
-	    tagmap_add(taglist->tagmap, newtag);
+	    int id = swf_GetDefineID(t);
+	    tagmap_addMapping(taglist->tagmap, id, newtag);
 	}
 	nr++;
 	t=t->next;
@@ -70,6 +84,7 @@ TAG* taglist_getTAGs(PyObject*self)
 	tag = tag_getTAG(item, tag, taglist->tagmap);
 	if(!firstTag)
 	    firstTag = tag;
+	mylog(" %08x(%d) taglist_getTAGs: added tag %08x", (int)self, self->ob_refcnt, tag);
     }
     return firstTag;
 }
@@ -150,7 +165,7 @@ static int taglist_length(PyObject * self)
 //----------------------------------------------------------------------------
 static int taglist_contains(PyObject * self, PyObject * tag)
 {
-    mylog(" %08x(%d) taglist_contains %08x", (int)self, self->ob_refcnt, tag);
+    /* TODO: optimize! */
     TagListObject*taglist = (TagListObject*)self;
     PyObject*list = taglist->taglist;
     int l = PyList_Size(list);
@@ -158,11 +173,9 @@ static int taglist_contains(PyObject * self, PyObject * tag)
     for(t=0;t<l;t++) {
 	PyObject*item = PyList_GetItem(list, t);
 	if(item == tag) {
-	    mylog(" %08x(%d) taglist_contains: yes", (int)self, self->ob_refcnt);
 	    return 1;
 	}
     }
-    mylog(" %08x(%d) taglist_contains: no", (int)self, self->ob_refcnt);
     return 0;
 }
 //----------------------------------------------------------------------------
@@ -261,7 +274,7 @@ static PyObject * taglist_item(PyObject * self, int index)
     PyObject*tag;
     mylog(" %08x(%d) taglist_item(%d)", (int)self, self->ob_refcnt, index);
     tag = PyList_GetItem(taglist->taglist, index);
-    Py_INCREF(tag); //TODO-REF
+    Py_INCREF(tag);
     return tag;
 }
 static PySequenceMethods taglist_as_sequence =