X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=db6617625e1f558ac15a17cd6c889d05f85ebb0b;hb=a970a6438fa892d043faac61ea6e27c8c88f79fa;hp=99e36b6dc73ef3d76e5289c56c8c9c79d5a952a5;hpb=9ebc3dc9c1854d42aab45a86b86f1d6ebce5f02e;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 99e36b6..db66176 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -126,6 +126,22 @@ typedef struct _TAG             // NEVER access a Tag-Struct directly !
   
 } TAG, * LPTAG;
 
+typedef struct _SOUNDINFO 
+{
+    U8 stop;
+    U8 multiple; //continue playing if already started
+
+    U32 inpoint;
+    U32 outpoint;
+
+    U16 loops;
+    U8 envelopes;
+
+    //envelope:
+    U32* pos;
+    U32* left;
+    U32* right;
+} SOUNDINFO;
 
 typedef struct _SWF
 { U8            fileVersion;
@@ -158,7 +174,9 @@ int  swf_ReadHeader(struct reader_t*reader, SWF * swf);   // Reads SWF Header vi
 // folding/unfolding:
 
 void swf_FoldAll(SWF*swf);
+void swf_UnFoldAll(SWF*swf);
 void swf_FoldSprite(TAG*tag);
+void swf_UnFoldSprite(TAG*tag);
 
 // basic routines:
     
@@ -253,6 +271,7 @@ int   swf_SetRGBA(TAG * t,RGBA * col);
 #define ST_PROTECT              24 /* This file should not be importable for editing. */
 #define ST_PLACEOBJECT2         26 /* The new style place w/ alpha color transform and name. */
 #define ST_REMOVEOBJECT2        28 /* A more compact remove object that omits the character tag (just depth). */
+#define ST_FREEALL              31 /* ? */
 #define ST_DEFINESHAPE3         32 /* A shape V3 includes alpha values. */
 #define ST_DEFINETEXT2          33 /* A text V2 includes alpha values. */
 #define ST_DEFINEBUTTON2        34 /* A button V2 includes color transform, alpha and multiple actions */
@@ -274,10 +293,10 @@ int   swf_SetRGBA(TAG * t,RGBA * col);
 #define ST_EXPORTASSETS		56
 #define ST_IMPORTASSETS		57
 #define ST_ENABLEDEBUGGER	58
-#define ST_MX0			59 /*(?) Components/InitClip */
-#define ST_MX1			60 /*(?) Sorensen Video*/
-#define ST_MX2			61 /*(?) Sorensen Video*/
-#define ST_MX3			62 /*(?) fontinfo2? */
+#define ST_DOINITACTION         59
+#define ST_DEFINEVIDEOSTREAM    60
+#define ST_VIDEOFRAME           61
+#define ST_DEFINEFONTINFO2	62
 #define ST_MX4			63 /*(?) */
 
 #define ST_REFLEX              777 /* to identify generator software */
@@ -423,6 +442,7 @@ typedef struct _SWFFONT
   U16	*	glyph2ascii;
   int	*	ascii2glyph;
   SWFGLYPH *	glyph;
+  U8		language;
 } SWFFONT, * LPSWFFONT;
 
 typedef struct _FONTUSAGE
@@ -438,12 +458,12 @@ typedef struct _FONTUSAGE
 #define ET_HASMAXLENGTH 512
 #define ET_HASFONT 256
 #define ET_X3 128
-#define ET_X2 64
+#define ET_AUTOSIZE 64 /* MX */
 #define ET_HASLAYOUT 32
 #define ET_NOSELECT 16
 #define ET_BORDER 8
 #define ET_X1 4
-#define ET_X0 2
+#define ET_HTML 2 /* MX? */
 #define ET_USEOUTLINES 1
 
 typedef struct _EditTextLayout
@@ -480,10 +500,6 @@ void swf_FontAddLayout(SWFFONT * f, int ascent, int descent, int leading);
 int swf_FontExtract_DefineTextCallback(int id,SWFFONT * f,TAG * t,int jobs, 
 	void(*callback)(int*chars, int nr, int id));
 
-// the following two functions are obsolete and will be removed soon
-int swf_FontExport(int handle,SWFFONT * f);
-int swf_FontImport(int handle,SWFFONT * * f);
-
 void swf_WriteFont(SWFFONT* font, char* filename);
 SWFFONT* swf_ReadFont(char* filename);
 
@@ -502,6 +518,8 @@ int swf_TextPrintDefineText(TAG * t,SWFFONT * f);
 void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color, 
 	int maxlength, U16 font, U16 height, EditTextLayout*layout, char*variable);
 
+void swf_SetDefineText(TAG*tag, SWFFONT*font, RGBA*rgb, char*text, int scale);
+
 // swfdump.c
 
 void swf_DumpHeader(FILE * f,SWF * swf);
@@ -614,8 +632,11 @@ int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
-/* expects 2304 samples */
-void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first);
+void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first); /* expects 2304 samples */
+
+void swf_SetSoundDefine(TAG*tag, S16*samples, int num);
+
+void swf_SetSoundInfo(TAG*tag, SOUNDINFO*info);
 
 #endif // RFXSWF_DISABLESOUND
 
@@ -768,7 +789,7 @@ void action_fixjump(ActionMarker m1, ActionMarker m2);
 
 // swfobject.c
 
-// The following routines only use placeobject2:
+// The following 3 routines only use placeobject2:
 
 int swf_ObjectPlace(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name);
 int swf_ObjectPlaceClip(TAG * t,U16 id,U16 depth,MATRIX * m,CXFORM * cx,U8 * name, U16 clipaction);