X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.c;h=c7d2df0e7bc92848b6e0547823070c45217f1bc3;hb=a53d77b39b0c04cfd1147dd883a469377c035f1f;hp=f48045848ba02a88947643be8c4c09c1a8dc30f9;hpb=3c7acbedb30491cc7e7e827f06853bc18ec91759;p=swftools.git

diff --git a/lib/rfxswf.c b/lib/rfxswf.c
index f480458..c7d2df0 100644
--- a/lib/rfxswf.c
+++ b/lib/rfxswf.c
@@ -1,5 +1,4 @@
 /* vi: set sts=2 sw=2 :*/
-
 /* rfxswf.c 
 
    Library for creating and reading SWF files or parts of it.
@@ -8,11 +7,22 @@
 
    Part of the swftools package.
 
-   Copyright (c) 2000, 2001 Rainer Böhme <rfxswf@reflex-studio.de>
- 
-   This file is distributed under the GPL, see file COPYING for details 
+   Copyright (c) 2000-2003 Rainer Böhme <rfxswf@reflex-studio.de>
+   Copyright (c) 2003 Matthias Kramm <kramm@quiss.org> 
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-*/
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
 #include "rfxswf.h"
 
@@ -42,7 +52,6 @@
 
 TAG * swf_NextTag(TAG * t) { return t->next; }
 TAG * swf_PrevTag(TAG * t) { return t->prev; }
-int   swf_GetFrameNo(TAG * t)  { return t->frame; }
 U16   swf_GetTagID(TAG * t)    { return t->id; }
 U32   swf_GetTagLen(TAG * t) { return t->len; }
 U8*   swf_GetTagLenPtr(TAG * t) { return &(t->data[t->len]); }
@@ -621,18 +630,7 @@ int swf_SetPoint(TAG * t,SPOINT * p) { return 0; }
 
 // Tag List Manipulating Functions
 
-int swf_UpdateFrame(TAG * t,S8 delta)
-// returns number of frames
-{ int res = -1;
-  while (t)
-  { t->frame+=delta;
-    res = t->frame;
-    t = t->next;
-  }
-  return res;
-}
-
-TAG * swf_InsertTag(TAG * after,U16 id)     // updates frames, if nescessary
+TAG * swf_InsertTag(TAG * after,U16 id)
 { TAG * t;
 
   t = (TAG *)malloc(sizeof(TAG));
@@ -641,19 +639,17 @@ TAG * swf_InsertTag(TAG * after,U16 id)     // updates frames, if nescessary
     t->id = id;
     
     if (after)
-    { t->frame = after->frame;
+    {
       t->prev  = after;
       t->next  = after->next;
       after->next = t;
       if (t->next) t->next->prev = t;
-      
-      if (id==ST_SHOWFRAME) swf_UpdateFrame(t->next,+1);
     }
   }
   return t;
 }
 
-TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)     // updates frames, if nescessary
+TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)
 { TAG * t;
 
   t = (TAG *)malloc(sizeof(TAG));
@@ -662,13 +658,11 @@ TAG * swf_InsertTagBefore(SWF* swf, TAG * before,U16 id)     // updates frames,
     t->id = id;
     
     if (before)
-    { t->frame = before->frame;
+    {
       t->next  = before;
       t->prev  = before->prev;
       before->prev = t;
       if (t->prev) t->prev->next = t;
-      
-      if (id==ST_SHOWFRAME) swf_UpdateFrame(t->next,+1);
     }
   }
   if(swf && swf->firstTag == before) {
@@ -697,8 +691,6 @@ void swf_ResetTag(TAG*tag, U16 id)
 int swf_DeleteTag(TAG * t)
 { if (!t) return -1;
 
-  if (t->id==ST_SHOWFRAME) swf_UpdateFrame(t->next,-1);
-    
   if (t->prev) t->prev->next = t->next;
   if (t->next) t->next->prev = t->prev;
 
@@ -726,7 +718,7 @@ TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
   }
 
   if (id==ST_DEFINESPRITE) len = 2*sizeof(U16);
-  // Sprite handling fix: Flaten sprite tree
+  // Sprite handling fix: Flatten sprite tree
 
   t = (TAG *)malloc(sizeof(TAG));
   
@@ -757,7 +749,7 @@ TAG * swf_ReadTag(struct reader_t*reader, TAG * prev)
   }
 
   if (prev)
-  { t->frame = prev->frame+((prev->id==ST_SHOWFRAME)?1:0);
+  {
     t->prev  = prev;
     prev->next = t;
   }
@@ -984,9 +976,12 @@ int swf_IsFolded(TAG * t)
 void swf_FoldAll(SWF*swf)
 {
     TAG*tag = swf->firstTag;
+    //swf_DumpSWF(stdout, swf);
     while(tag) {
-	if(tag->id == ST_DEFINESPRITE)
+	if(tag->id == ST_DEFINESPRITE) {
 	    swf_FoldSprite(tag);
+	    //swf_DumpSWF(stdout, swf);
+	}
 	tag = swf_NextTag(tag);
     }
 }
@@ -1222,8 +1217,10 @@ int  swf_WriteSWF(int handle, SWF * swf)     // Writes SWF to file, returns leng
 {
   struct writer_t writer;
   swf->compressed = 0;
-  if(handle<0)
+  if(handle<0) {
+    writer_init_nullwriter(&writer);
     return swf_WriteSWF2(&writer, swf);
+  }
   writer_init_filewriter(&writer, handle);
   return swf_WriteSWF2(&writer, swf);
 }
@@ -1232,8 +1229,10 @@ int  swf_WriteSWC(int handle, SWF * swf)     // Writes SWF to file, returns leng
 {
   struct writer_t writer;
   swf->compressed = 1;
-  if(handle<0)
+  if(handle<0) {
+    writer_init_nullwriter(&writer);
     return swf_WriteSWF2(&writer, swf);
+  }
   writer_init_filewriter(&writer, handle);
   return swf_WriteSWF2(&writer, swf);
 }
@@ -1295,4 +1294,3 @@ void swf_FreeTags(SWF * swf)                 // Frees all malloc'ed memory for t
 #include "modules/swfbits.c"
 #include "modules/swfaction.c"
 #include "modules/swfsound.c"
-#include "h.263/swfvideo.c"