X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=lib%2Frfxswf.h;h=9edaea0bc2eac9dcd0b96e51ecb79f3c81eef1c9;hb=4156343ba2d500f053cf47fb4754e4da5d7a85da;hp=25bdb792a184baa0c0437f85e08aa895f5c6db81;hpb=184e254064d3c828222b3d731be47c1cd02e8338;p=swftools.git

diff --git a/lib/rfxswf.h b/lib/rfxswf.h
index 25bdb79..9edaea0 100644
--- a/lib/rfxswf.h
+++ b/lib/rfxswf.h
@@ -20,7 +20,9 @@
 #include <fcntl.h>
 #include <ctype.h>
 #include "../config.h"
-#include "bladeenc/codec.h"
+
+#define LAME
+#include "lame/lame.h"
 
 #define DEBUG_RFXSWF
 
@@ -285,7 +287,8 @@ int   swf_SetRGBA(TAG * t,RGBA * col);
 #define ST_MX0			59 /*(?) Components/InitClip */
 #define ST_MX1			60 /*(?) Sorensen Video*/
 #define ST_MX2			61 /*(?) Sorensen Video*/
-#define ST_MX3			62 /*(?) */
+#define ST_MX3			62 /*(?) fontinfo2? */
+#define ST_MX4			63 /*(?) */
 
 #define ST_REFLEX              777 /* to identify generator software */
 
@@ -574,7 +577,8 @@ int swf_SetJPEGBitsLines(JPEGBITS * jpegbits,U8 ** data,int n);
 int swf_SetJPEGBitsLine(JPEGBITS * jpegbits,U8 * data);
 int swf_SetJPEGBitsFinish(JPEGBITS * jpegbits);
 
-int swf_SetJPEGBits(TAG * t,char * fname,int quality); // paste jpg file into swf stream
+int swf_SetJPEGBits(TAG * t,char * fname,int quality);
+void swf_SetJPEGBits2(TAG * t,U16 width,U16 height,RGBA * bitmap,int quality);
 
 #define BYTES_PER_SCANLINE(width) ((width+3)&0xfffffffc)
 
@@ -597,8 +601,9 @@ int swf_SetLosslessBitsGrayscale(TAG * t,U16 width,U16 height,U8 * bitmap);
 #ifndef RFXSWF_DISABLESOUND
 
 // swfsound.c
-void swf_SetSoundStreamHead(TAG*tag, U16 avgnumsamples);
-void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int numsamples, char first);
+void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples);
+/* expects 2304 samples */
+void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first);
 
 #endif // RFXSWF_DISABLESOUND