X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fwav2swf.c;h=87cb0053ec4b528d0ebed4be86c34201098ba401;hb=92013ccec1cef810347d61538e376d53d4a444f3;hp=c5744b74831e945a4ce44c0b8b85f2f1949d4304;hpb=0f50b9ef526a82c2e86e0a90fc707c0aa43d3e36;p=swftools.git

diff --git a/src/wav2swf.c b/src/wav2swf.c
index c5744b7..87cb005 100644
--- a/src/wav2swf.c
+++ b/src/wav2swf.c
@@ -30,6 +30,7 @@ char * filename = 0;
 char * outputname = "output.swf";
 int verbose = 2;
 int stopframe0 = 0;
+int stopframe1 = 0;
 
 #define DEFINESOUND_MP3 1 //define sound uses mp3?- undefine for raw sound.
 
@@ -39,11 +40,11 @@ static struct options_t options[] = {
 {"o", "output"},
 {"r", "framerate"},
 {"s", "samplerate"},
-{"b", "bitrate"},
 {"d", "definesound"},
 {"l", "loop"},
 {"C", "cgi"},
 {"S", "stop"},
+{"E", "end"},
 {"b", "bitrate"},
 {"v", "verbose"},
 {0,0}
@@ -86,6 +87,10 @@ int args_callback_option(char*name,char*val)
 	stopframe0 = 1;
 	return 0;
     }
+    else if(!strcmp(name, "E")) {
+	stopframe1 = 1;
+	return 0;
+    }
     else if(!strcmp(name, "C")) {
 	do_cgi = 1;
 	return 0;
@@ -157,11 +162,11 @@ void args_callback_usage(char *name)
     printf("-o , --output <filename>       Explicitly specify output file. (Otherwise, output will go to output.swf)\n");
     printf("-r , --framerate <fps>         Set file framerate to <fps> frames per second.\n");
     printf("-s , --samplerate <sps>        Set samplerate to <sps> frames per second (default: 11025).\n");
-    printf("-b , --bitrate bps             Set mp3 bitrate to <bps>.\n");
     printf("-d , --definesound             Generate a DefineSound tag instead of streaming sound.\n");
     printf("-l , --loop n                  (Only used with -d)\n");
     printf("-C , --cgi                     For use as CGI- prepend http header, write to stdout.\n");
     printf("-S , --stop                    Stop the movie at frame 0\n");
+    printf("-E , --end                     Stop the movie at the end frame\n");
     printf("-b , --bitrate <bps>           Set mp3 bitrate to <bps> (default: 32)\n");
     printf("-v , --verbose                 Be more verbose\n");
     printf("\n");
@@ -337,6 +342,15 @@ int main (int argc,char ** argv)
 	info.loops = loop;
 	swf_SetSoundInfo(tag, &info);
 	tag = swf_InsertTag(tag, ST_SHOWFRAME);
+        if(stopframe1) {
+	    ActionTAG*action = 0;
+	    tag = swf_InsertTag(tag, ST_DOACTION);
+	    action = action_Stop(action);
+	    action = action_End(action);
+	    swf_ActionSet(tag, action);
+	    swf_ActionFree(action);
+	    tag = swf_InsertTag(tag, ST_SHOWFRAME);
+        }
 	tag = swf_InsertTag(tag, ST_END);
     }