X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=3621321b4d885500530b59e24f89bfdefe9c6f4a;hb=a6f4bf74f964e101e25f0234ebcb3c3dde175df4;hp=2e12d125ac04a32a6e6f63c45112d2a2f892ddf2;hpb=58e7d89f8115525c32a0e3f3f4e5501c6a17186d;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 2e12d12..3621321 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -39,6 +39,9 @@ extern "C" {
 #include "./drawer.h"
 
 #define DEBUG_RFXSWF
+#ifdef RFXSWF_DISABLESOUND
+#define NO_MP3
+#endif
 
 #ifndef TRUE
 #define TRUE (1)
@@ -148,6 +151,9 @@ typedef struct _TAG             // NEVER access a Tag-Struct directly !
   
 } TAG, * LPTAG;
 
+#define swf_ResetReadBits(tag)   if (tag->readBit)  { tag->pos++; tag->readBit = 0; }
+#define swf_ResetWriteBits(tag)  if (tag->writeBit) { tag->writeBit = 0; }
+
 typedef struct _SOUNDINFO 
 {
     U8 stop;
@@ -448,8 +454,13 @@ void	    swf_SetShape2(TAG*tag, SHAPE2*shape);
 void	   swf_Shape2Free(SHAPE2 * s);
 void	swf_DumpShape(SHAPE2*shape2);
 
+void swf_ParseDefineShape(TAG*tag, SHAPE2*shape);
+void swf_Shape2ToShape(SHAPE2*shape2, SHAPE*shape);
+void swf_SetShape2(TAG*tag, SHAPE2*shape2);
+
 // swfdraw.c
 
+void swf_Shape10DrawerInit(drawer_t*draw, TAG*tag);
 void swf_Shape01DrawerInit(drawer_t*draw, TAG*tag);
 void swf_Shape11DrawerInit(drawer_t*draw, TAG*tag);
 SHAPE* swf_ShapeDrawerToShape(drawer_t*draw);
@@ -549,7 +560,7 @@ int swf_FontSetID(SWFFONT * f,U16 id);
 int swf_FontReduce(SWFFONT * f,FONTUSAGE * use);
 
 int swf_FontInitUsage(SWFFONT * f,FONTUSAGE * use);
-int swf_FontUse(FONTUSAGE * use,U8 * s);
+int swf_FontUse(SWFFONT* f,FONTUSAGE * use,U8 * s);
 
 int swf_FontSetDefine(TAG * t,SWFFONT * f);
 int swf_FontSetDefine2(TAG * t,SWFFONT * f);
@@ -558,8 +569,7 @@ int swf_FontSetInfo(TAG * t,SWFFONT * f);
 void swf_FontCreateLayout(SWFFONT*f);
 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));
+int swf_ParseDefineText(TAG * t, void(*callback)(void*self, int*chars, int*xpos, int nr, int fontid, int fontsize, int xstart, int ystart, RGBA* color), void*self);
 
 void swf_WriteFont(SWFFONT* font, char* filename);
 SWFFONT* swf_ReadFont(char* filename);
@@ -582,7 +592,7 @@ void swf_SetEditText(TAG*tag, U16 flags, SRECT r, char*text, RGBA*color,
 
 SRECT swf_SetDefineText(TAG*tag, SWFFONT*font, RGBA*rgb, char*text, int scale);
 
-void swf_DrawText(drawer_t*draw, SWFFONT*font, char*text);
+void swf_DrawText(drawer_t*draw, SWFFONT*font, int size, char*text);
 
 // swffont.c
 
@@ -610,6 +620,10 @@ void swf_DumpFont(SWFFONT * font);
 
 // Button Conditions
 
+/* missing: IDLE_OUTDOWN 
+            OUTDOWN_OVERUP
+	    OVERUP_OUTDOWN
+*/
 #define BC_OVERDOWN_IDLE        0x0100
 #define BC_IDLE_OVERDOWN        0x0080
 #define BC_OUTDOWN_IDLE         0x0040
@@ -690,30 +704,16 @@ int swf_SetJPEGBits3(TAG * tag,U16 width,U16 height,RGBA* bitmap, int quality);
 #define BMF_16BIT       4
 #define BMF_32BIT       5
 
-#define BM16_BLUE       0xf800          // Bitmasks for 16 Bit Color
-#define BM16_RED        0x00f0
-#define BM16_GREEN      0x000f
-
-#define BM32_BLUE       0xff000000      // Bitmasks for 32 Bit Color
-#define BM32_GREEN      0x00ff0000
-#define BM32_RED        0x0000ff00
-
 int swf_SetLosslessBits(TAG * t,U16 width,U16 height,void * bitmap,U8 bitmap_flags);
 int swf_SetLosslessBitsIndexed(TAG * t,U16 width,U16 height,U8 * bitmap,RGBA * palette,U16 ncolors);
 int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 
-#ifndef RFXSWF_DISABLESOUND
-
 // swfsound.c
 void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
 void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int seek, char first); /* expects 2304 samples */
-
 void swf_SetSoundDefine(TAG*tag, S16*samples, int num);
-
 void swf_SetSoundInfo(TAG*tag, SOUNDINFO*info);
 
-#endif // RFXSWF_DISABLESOUND
-
 // swftools.c
 
 U8 swf_isDefiningTag(TAG * t);
@@ -733,6 +733,8 @@ void swf_GetUsedIDs(TAG * t, int * positions);
 void swf_Relocate(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[a]==0 means id a is free
 void swf_RelocateDepth(SWF*swf, char*bitmap); // bitmap is 65536 bytes, bitmap[d]==0 means depth d is free
 
+TAG* swf_Concatenate (TAG*list1,TAG*list2); // warning: both list1 and list2 are invalid after this call.
+
 // swfcgi.c
 
 void swf_uncgi();  // same behaviour as Steven Grimm's uncgi-library
@@ -919,6 +921,7 @@ typedef struct _VIDEOSTREAM
 void swf_SetVideoStreamDefine(TAG*tag, VIDEOSTREAM*stream, U16 frames, U16 width, U16 height);
 void swf_SetVideoStreamIFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/);
 void swf_SetVideoStreamPFrame(TAG*tag, VIDEOSTREAM*s, RGBA*pic, int quant/* 1-31, 1=best quality, 31=best compression*/);
+void swf_SetVideoStreamMover(TAG*tag, VIDEOSTREAM*s, signed char* movex, signed char* movey, int quant);
 void swf_VideoStreamClear(VIDEOSTREAM*stream);
 
 #ifdef __cplusplus