X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fflash.h;h=27d31a84cb0692d79f612a0f9b3ba33bb151bf88;hb=1e33565b4a202a89b2aee42a5bdc19e5ad4b47cd;hp=255aeff581adc142cfd89510595d249fc135a841;hpb=fc554a43712b76d16b41ec77dd311b4a78b1ef6b;p=swftools.git

diff --git a/src/flash.h b/src/flash.h
index 255aeff..27d31a8 100644
--- a/src/flash.h
+++ b/src/flash.h
@@ -11,6 +11,7 @@
 #define __flash_h__
 
 #include "types.h"
+#include "../lib/rfxswf.h"
 
 #define TAGID_END 0
 #define TAGID_SHOWFRAME 1
@@ -27,12 +28,14 @@
 #define TAGID_DEFINEFONTINFO 13
 #define TAGID_DEFINESOUND 14
 #define TAGID_STARTSOUND 15
+#define TAGID_DEFINEBUTTONSOUND 17
 #define TAGID_SOUNDSTREAMHEAD 18
 #define TAGID_SOUNDSTREAMHEAD2 18
 #define TAGID_SOUNDSTREAMBLOCK 19
 #define TAGID_DEFINEBITSLOSSLESS 20
 #define TAGID_DEFINEBITSJPEG2 21
 #define TAGID_DEFINESHAPE2 22
+#define TAGID_DEFINEBUTTONCXFORM 23
 #define TAGID_PROTECT 24
 #define TAGID_PLACEOBJECT2 26
 #define TAGID_REMOVEOBJECT2 28
@@ -62,7 +65,7 @@ struct CLIPACTIONS;
 
 struct swf_tag
 {
-    u8 id;
+    u16 id;
     u32 length;
     u8*data;
     u32 fulllength; // includes id
@@ -113,12 +116,11 @@ struct RECT readRECT();
 struct RGB readRGB();
 struct MATRIX readMATRIX();
 unsigned char* readSTRING();
-struct CXFORM readCXFORM();
 struct CLIPACTIONS readCLIPACTIONS();
 
 void writeRECT(u8**pos, struct RECT*r);
 
-void swf_init(uchar*newdata, int newlength);
+void swf_init(struct reader_t*,uchar*newdata, int newlength);
 struct flash_header
 {
     int version;
@@ -138,16 +140,16 @@ struct swffile
     struct swf_tag* tags;
 };
 
-struct flash_header swf_read_header();
-struct RGB readRGB();
-struct RGBA readRGBA();
-struct GRADIENT readGRADIENT(int shape);
-struct RECT readRECT();
-struct CXFORM readCXFORM();
-struct MATRIX readMATRIX();
-unsigned char* readSTRING();
-int swf_read_tag(struct swf_tag* swftag);
-int swf_count_tags();
+struct flash_header swf_read_header(struct reader_t*);
+struct RGB readRGB(struct reader_t*);
+struct RGBA readRGBA(struct reader_t*);
+struct GRADIENT readGRADIENT(struct reader_t*,int shape);
+struct RECT readRECT(struct reader_t*);
+struct CXFORM readCXFORM(struct reader_t*,char alpha);
+struct MATRIX readMATRIX(struct reader_t*);
+unsigned char* readSTRING(struct reader_t*);
+int swf_read_tag(struct reader_t*,struct swf_tag* swftag);
+int swf_count_tags(struct reader_t*);
 
 
 struct PlaceObject