X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fwav2swf.c;h=157b9b5fc20b8953087c0c37da9aee9bb69c16c5;hb=77374b6b5505022a057dbab119854c6b4ad48916;hp=70315b21838c9fd047bd6bedcdc302d3c397cd16;hpb=0e8807d9a620e8932bc67653321eaae1436fdd43;p=swftools.git

diff --git a/src/wav2swf.c b/src/wav2swf.c
index 70315b2..157b9b5 100644
--- a/src/wav2swf.c
+++ b/src/wav2swf.c
@@ -24,7 +24,7 @@ struct options_t options[] =
  {"v","verbose"},
  {"d","definesound"},
  {"l","loop"},
- {"f","framerate"},
+ {"r","framerate"},
  {"V","version"},
  {0,0}
 };
@@ -49,13 +49,14 @@ int args_callback_option(char*name,char*val)
     }
     else if(!strcmp(name, "l")) {
 	loop = atoi(val);
+	definesound = 1;
 	return 1;
     }
     else if(!strcmp(name, "v")) {
 	verbose ++;
 	return 0;
     }
-    else if(!strcmp(name, "f")) {
+    else if(!strcmp(name, "r")) {
 	float f;
 	sscanf(val, "%f", &f);
 	framerate = f*256;
@@ -77,7 +78,7 @@ void args_callback_usage(char*name)
     printf("\t-v , --verbose\t\t\t Be more verbose\n");
     printf("\t-d , --definesound\t\t\t Generate a DefineSound tag instead of streaming sound\n");
     printf("\t-l , --loop n\t\t\t Loop sound n times (implies -d)\n");
-    printf("\t-f , --framerate fps\t\t\t Set framerate to fps frames per seond\n");
+    printf("\t-r , --framerate fps\t\t\t Set framerate to fps frames per seond\n");
     printf("\t-o , --output filename\t\t set output filename (default: output.swf)\n");
     printf("\t-V , --version\t\t\t Print program version and exit\n");
 }
@@ -113,6 +114,10 @@ int main (int argc,char ** argv)
 
     processargs(argc, argv);
 
+    if(!definesound && framerate) {
+	printf("Warning! The -r option is experimental and won't work without -d\n");
+    }
+
     blocksize = 1152;
     blockspersecond = 11025.0/blocksize;
     framespersecond = blockspersecond;
@@ -161,7 +166,8 @@ int main (int argc,char ** argv)
 	    tag = swf_InsertTag(tag, ST_SOUNDSTREAMBLOCK);
 	    logf("<notice> Writing block %d", t);
 	    block1 = &samples[t*2*blocksize];
-	    swf_SetSoundStreamBlock(tag, block1, 1);
+	    swf_SetSoundStreamBlock(tag, block1, 0, 1);
+
 	    oldframe = (int)framepos;
 	    framepos += framesperblock;
 	    newframe = (int)framepos;