X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=23fa6f67bd167389af6b930939a813185e17dd76;hb=191439ab6ffe1cad91825ae84286bf720370f863;hp=6fd2f3f99c30204d5c3d9988f38fe05c2d3dc086;hpb=a0c23e11cb8ea79e4fabd9d491d1716412746df4;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 6fd2f3f..23fa6f6 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -38,6 +38,7 @@ extern "C" {
 #include "../config.h"
 #include "./bitio.h"
 #include "./drawer.h"
+#include "./mem.h"
 
 #define DEBUG_RFXSWF
 #ifdef RFXSWF_DISABLESOUND
@@ -72,16 +73,6 @@ extern "C" {
 #define REVERSESWAP32(s) (REVERSESWAP16(((s)>>16)&0x0000ffff)|((REVERSESWAP16(s)<<16)&0xffff0000))
 #endif
 
-#define ALLOC_ARRAY(type, num) (((type)*)rfxalloc(sizeof(type)*(num)))
-void* rfx_alloc(int size);
-void* rfx_calloc(int size);
-void* rfx_realloc(void*data, int size);
-void rfx_free(void*data);
-#ifdef MEMORY_INFO
-long rfx_memory_used();
-char* rfx_memory_used_str();
-#endif
-
 // SWF Types
 
 typedef         unsigned long   U32;
@@ -501,6 +492,7 @@ typedef struct
 typedef struct _FONTUSAGE
 { int* chars;
   char is_reduced;
+  int used_glyphs;
 } FONTUSAGE;
 
 #define FONT_STYLE_BOLD 1
@@ -746,6 +738,10 @@ TAG* swf_AddImage(TAG*tag, int bitid, RGBA*mem, int width, int height, int quali
 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_SetSoundDefineMP3(TAG*tag, U8* data, unsigned length,
+                           unsigned SampRate,
+                           unsigned Channels,
+                           unsigned NumFrames);
 void swf_SetSoundInfo(TAG*tag, SOUNDINFO*info);
 
 // swftools.c
@@ -795,7 +791,7 @@ typedef struct _ActionTAG
   struct _ActionTAG * prev;
 
   struct _ActionTAG * parent;
-  U8 tmp[4]; // store small operands here.
+  U8 tmp[8]; // store small operands here.
 } ActionTAG;
 
 typedef struct _ActionMarker