X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=caee1298c3c5cac5f9b72e0e29c080461a84a4d2;hb=6ff62a9d22bbce555f37effa68787d0c1b187dc3;hp=77597b661c48787f23a4f681a12e3649898ce48a;hpb=fc554a43712b76d16b41ec77dd311b4a78b1ef6b;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 77597b6..caee129 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,28 @@ int args_callback_option(char*name,char*val) {
 	config.movey = atoi(val);
 	return 1;
     }
+    else if (!strcmp(name, "d"))
+    {
+	config.dummy = 1;
+	return 0;
+    }
+    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 +104,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 +114,25 @@ int args_callback_option(char*name,char*val) {
     }
 }
 
-struct options_t
-{
-    char*shortoption;
-    char*longoption;
-} options[] =
+struct options_t options[] =
 {{"o","output"},
  {"s","scale"},
+ {"d","dummy"},
  {"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 +175,20 @@ 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("-d                  (dummy) Don't require slave objects \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 +237,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 +344,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,7 +352,13 @@ 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;
+    config.dummy = 0;
 
     processargs(argn, argv);
     initLog(0,-1,0,0,-1,config.loglevel);
@@ -365,10 +394,22 @@ int main(int argn, char *argv[])
 	logf("<debug> Read %d bytes from masterfile\n", masterlength);
 	fclose(fi);
     }
-    
+
     for(t=0;t<numslaves;t++)
 	logf("<verbose> slave entity(%d) %s (named \"%s\")\n", t+1, slave_filename[t], slave_name[t]);
 
+    if(config.dummy)
+    {
+	if(numslaves)
+	{
+	    logf("<error> --dummy (-d) implies there are zero slave objects. You supplied %d.", numslaves);
+	    exit(1);
+	}
+	numslaves = 1;
+	slave_filename[t] = "!!dummy!!";
+	slave_name[t] = "!!dummy!!";
+    }
+
     if (config.alloctest)
     {
 	int*bitmap = malloc(sizeof(int)*65536);
@@ -395,18 +436,35 @@ int main(int argn, char *argv[])
 
 	    logf("<notice> Combine [%s]%s and [%s]%s", master_name, master_filename,
 		    slave_name[t], slave_filename[t]);
-	    fi = fopen(slave_filename[t], "rb");
-	    if(!fi) {
-		fprintf(stderr, "Failed to open %s\n", slave_filename[t]);
-		return 1;
+	    if(!config.dummy)
+	    {
+		fi = fopen(slave_filename[t], "rb");
+		if(!fi) {
+		    fprintf(stderr, "Failed to open %s\n", slave_filename[t]);
+		    return 1;
+		}
+		slavedata = fi_slurp(fi, &slavelength);
+		if(!slavedata) {
+		    fprintf(stderr, "Failed to read from %s\n", slave_filename[t]);
+		    return 1;
+		}
+		logf("<debug> Read %d bytes from slavefile\n", slavelength);
+		fclose(fi);
 	    }
-	    slavedata = fi_slurp(fi, &slavelength);
-	    if(!slavedata) {
-		fprintf(stderr, "Failed to read from %s\n", slave_filename[t]);
-		return 1;
+	    else
+	    {
+		slavedata = (u8*)malloc(16);
+		slavedata[0] = 'F';
+		slavedata[1] = 'W';
+		slavedata[2] = 'S';
+		slavedata[3] = 4; //version
+		*(u32*)&slavedata[4] = 14; // length
+		slavedata[8] = 0; // boundingbox
+		*(u16*)&slavedata[9] = 0; // rate
+		*(u16*)&slavedata[11] = 0; // count
+		*(u16*)&slavedata[13] = 0; // end tag
+		slavelength = 17;
 	    }
-	    logf("<debug> Read %d bytes from slavefile\n", slavelength);
-	    fclose(fi);
 
 	    newdata = combine(masterdata, masterlength, slave_name[t], slavedata, slavelength, &newlength);
 	    if(!newdata) {