X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;ds=inline;f=lib%2Fmodules%2Fswfsound.c;h=b2801bdbd6bd79116d8ae909601cc93c4f6d9152;hb=fd6e788f8b2f31b597f30207178f279f106b4b77;hp=fe3461d35881cf229c3097f3e1d6d8646f9ec5a3;hpb=a970a6438fa892d043faac61ea6e27c8c88f79fa;p=swftools.git

diff --git a/lib/modules/swfsound.c b/lib/modules/swfsound.c
index fe3461d..b2801bd 100644
--- a/lib/modules/swfsound.c
+++ b/lib/modules/swfsound.c
@@ -70,15 +70,19 @@ void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int numsamples, char first)
 #ifdef LAME
 
 #include "../lame/lame.h"
-    
+
+/* TODO: find a way to set these from the outside */
+int swf_mp3_samplerate = 44100;
+int swf_mp3_channels = 1;
+
 static lame_global_flags*lame_flags;
 
 static void initlame(unsigned char*buf, int bufsize)
 {
     lame_flags = lame_init();
 
-    lame_set_in_samplerate(lame_flags, 44100);
-    lame_set_num_channels(lame_flags, 1);
+    lame_set_in_samplerate(lame_flags, swf_mp3_samplerate);
+    lame_set_num_channels(lame_flags, swf_mp3_channels);
     lame_set_scale(lame_flags, 0);
 
     // MPEG1    32, 44.1,   48khz
@@ -127,7 +131,7 @@ void swf_SetSoundStreamHead(TAG*tag, int avgnumsamples)
     swf_SetU16(tag,avgnumsamples);
 }
 
-void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first)
+void swf_SetSoundStreamBlock(TAG*tag, S16*samples, int seek, char first)
 {
     char*buf;
     int oldlen=0,len = 0;
@@ -141,8 +145,8 @@ void swf_SetSoundStreamBlock(TAG*tag, S16*samples, char first)
     if(first) {
 	int fs = lame_get_framesize(lame_flags);
 	//printf("framesize:%d\n", fs);
-	swf_SetU16(tag, fs); // samples per mp3 frame
-	swf_SetU16(tag, 0); // seek
+	swf_SetU16(tag, fs * first); // samples per mp3 frame
+	swf_SetU16(tag, seek); // seek
     }
 
     len += lame_encode_buffer(lame_flags, samples, samples, numsamples, &buf[len], bufsize-len);