X-Git-Url: http://git.asbjorn.it/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=afa18321aabeba90f08d5648528ae2e0d2229044;hb=70549d849620be47cae25fc57438aa524d6c8c17;hp=77597b661c48787f23a4f681a12e3649898ce48a;hpb=fc554a43712b76d16b41ec77dd311b4a78b1ef6b;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 77597b6..afa1832 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -10,11 +10,12 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "args.h"
+#include "../lib/args.h"
 #include "combine.h"
 #include "settings.h"
 #include "types.h"
 #include "flash.h"
+#include "../config.h"
 
 char * master_filename = 0;
 char * master_name = 0;
@@ -64,6 +65,23 @@ int args_callback_option(char*name,char*val) {
 	config.movey = atoi(val);
 	return 1;
     }
+    else if (!strcmp(name, "r"))
+    {
+	config.framerate = atoi(val)*256/100;
+	return 1;
+    }
+    else if (!strcmp(name, "X"))
+    {
+	config.sizex = atoi(val)*20;
+	config.hassizex = 1;
+	return 1;
+    }
+    else if (!strcmp(name, "Y"))
+    {
+	config.sizey = atoi(val)*20;
+	config.hassizey = 1;
+	return 1;
+    }
     else if (!strcmp(name, "s"))
     {
 	config.scalex = config.scaley = atoi(val)/100.0;
@@ -81,7 +99,7 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "V"))
     {	
-	printf("swfcombine - part of swftools 0.0.1\n");
+	printf("swfcombine - part of %s %s\n", PACKAGE, VERSION);
 	exit(0);
     }
     else 
@@ -91,28 +109,24 @@ int args_callback_option(char*name,char*val) {
     }
 }
 
-struct options_t
-{
-    char*shortoption;
-    char*longoption;
-} options[] =
+struct options_t options[] =
 {{"o","output"},
  {"s","scale"},
  {"x","xpos"},
  {"y","ypos"},
+ {"X","width"},
+ {"Y","height"},
+ {"r","rate"},
  {"l","overlay"},
+ {"t","stack"},
  {"v","verbose"},
  {"V","version"},
  {"c","clip"},
+ {0,0}
 };
 
 int args_callback_longoption(char*name,char*val) {
-    int t;
-    for(t=0;t<sizeof(options)/sizeof(struct options_t);t++)
-        if(!strcmp(options[t].longoption, name))
-            return args_callback_option(options[t].shortoption,val);
-    fprintf(stderr, "Unknown option: --%s\n", name);
-    exit(1);
+    return args_long2shortoption(options, name, val);
 }
 
 int args_callback_command(char*name, char*val) {
@@ -155,16 +169,19 @@ int args_callback_command(char*name, char*val) {
 
 void args_callback_usage(char*name)
 {
-    printf("Usage: %s [-l] [-o outputfile] [name=]masterfile [-x xpos] [-y ypos] [-s scale] [name1=]slavefile1 .. [-x xpos] [-y ypos] [-s scale] [nameN=]slavefileN\n", name);
+    printf("Usage: %s [-l][-t] [-o outputfile] [[name=]masterfile] [-x xpos] [-y ypos] [-s scale] [name1=]slavefile1 .. [-x xpos] [-y ypos] [-s scale] [nameN=]slavefileN\n", name);
     printf("\n");
-    printf("-o outputfile       explicitly specify output file. (otherwise, output.swf will be used)\n");
+    printf("-o outputfile       (output) explicitly specify output file. (otherwise, output.swf will be used)\n");
+    printf("-t                  (stack) place each slave into a seperate frame (no master movie)\n");
     printf("-l                  (overlay) Don't remove any master objects, only overlay new objects\n");
     printf("-c                  (clip) Clip the slave objects by the corresponding master objects\n");
     printf("-v                  (verbose) Use more than one -v for greater effect \n");
     printf("-x xpos             (move x) Adjust position of slave by xpos twips (1/20 pixel)\n");
     printf("-y ypos             (move y) Adjust position of slave by ypos twips (1/20 pixel)\n");
     printf("-s scale            (scale) Adjust size of slave by scale%\n");
-    printf("\n");
+    printf("-r framerate        (rate) Set movie framerate (100 frames/sec)\n");
+    printf("-X width            (width) Force movie width to scale (default: use master width) (not with -t)\n");
+    printf("-Y height           (height) Force movie height to scale (default: use master height) (not with -t)\n");
 }
 
 /* read a whole file in memory */
@@ -213,8 +230,6 @@ void makestackmaster(u8**masterdata, int*masterlength)
     int strlength = 0;
     int fileversion = 1;
 
-    logf("<error> stacking doesn't work yet. Prepare for problems.");
-
     /* scan all slaves for bounding box */
     for(t=0;t<numslaves;t++)
     {
@@ -322,6 +337,7 @@ int main(int argn, char *argv[])
     int t;
 
     config.overlay = 0; 
+    config.antistream = 0; 
     config.alloctest = 0;
     config.clip = 0;
     config.loglevel = 2; 
@@ -329,6 +345,11 @@ int main(int argn, char *argv[])
     config.movey = 0;
     config.scalex = 1.0;
     config.scaley = 1.0;
+    config.sizex = 0;
+    config.sizey = 0;
+    config.hassizex = 0;
+    config.hassizey = 0;
+    config.framerate = 0;
     config.stack = 0;
 
     processargs(argn, argv);