X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfcombine.c;h=f190e9a593456b89c45e834a63cc8e3aba5eb62e;hb=91f07304c9e9687652450f53938d76e1f60ddf76;hp=8102aba1dac949a326fc9a95b5f6c4baeef4195f;hpb=80d4ec51322bc02c9ef4581d0f095baa2a934ea9;p=swftools.git

diff --git a/src/swfcombine.c b/src/swfcombine.c
index 8102aba..f190e9a 100644
--- a/src/swfcombine.c
+++ b/src/swfcombine.c
@@ -25,6 +25,7 @@ int slave_movex[128];
 int slave_movey[128];
 float slave_scalex[128];
 float slave_scaley[128];
+char slave_isframe[128];
 int numslaves = 0;
 
 char * outputname = "output.swf";
@@ -52,6 +53,11 @@ int args_callback_option(char*name,char*val) {
     }
     else if (!strcmp(name, "a"))
     {
+	config.cat = 1;
+	return 0;
+    }
+    else if (!strcmp(name, "A"))
+    {
 	config.alloctest = 1;
 	return 0;
     }
@@ -65,18 +71,52 @@ int args_callback_option(char*name,char*val) {
 	config.movey = atoi(val);
 	return 1;
     }
+    else if (!strcmp(name, "m"))
+    {
+	config.merge = 1;
+	return 0;
+    }
+    else if (!strcmp(name, "f"))
+    {
+	config.isframe = 1;
+	return 0;
+    }
+    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;
 	return 1;
     }
-    else if (!strcmp(name, "t"))
+    else if (!strcmp(name, "t") || !strcmp(name, "T"))
     {
 	if(master_filename) {
 	    fprintf(stderr, "error with arguments. Try --help.\n");
 	    exit(1);
 	}
 	config.stack = 1;
+	if(!strcmp(name,"T"))
+	    config.stack1 = 1;
 	master_filename = "__none__";
 	return 0;
     }
@@ -95,12 +135,21 @@ int args_callback_option(char*name,char*val) {
 struct options_t options[] =
 {{"o","output"},
  {"s","scale"},
+ {"d","dummy"},
  {"x","xpos"},
  {"y","ypos"},
+ {"X","width"},
+ {"Y","height"},
+ {"r","rate"},
+ {"f","frame"},
  {"l","overlay"},
+ {"m","merge"},
+ {"t","stack"},
+ {"T","stack1"},
  {"v","verbose"},
  {"V","version"},
  {"c","clip"},
+ {"a","cat"},
  {0,0}
 };
 
@@ -127,7 +176,6 @@ int args_callback_command(char*name, char*val) {
     }
 
     if(!master_filename) {
-
 	master_filename = filename;
 	master_name = myname;
     } else {		 
@@ -139,6 +187,8 @@ int args_callback_command(char*name, char*val) {
 	slave_movey[numslaves] = config.movey;
 	slave_scalex[numslaves] = config.scalex;
 	slave_scaley[numslaves] = config.scaley;
+	slave_isframe[numslaves] = config.isframe; 
+	config.isframe = 0;
 	config.movex = config.movey = 0;
 	config.scalex = config.scaley = 1.0;
 	numslaves ++;
@@ -148,15 +198,27 @@ 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 [-rXYomlcv] [-f] masterfile] [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name);
+    printf("OR:    %s [-rXYomv] --stack[1] [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name);
+    printf("OR:    %s [-rXYov] --cat [-xysf] [(name1|#id1)=]slavefile1 .. [-xysf] [(nameN|#idN)=]slavefileN\n", name);
+    printf("OR:    %s [-rXYomlcv] --dummy [-xys] [file]\n", name);
     printf("\n");
-    printf("-o outputfile       explicitly specify output file. (otherwise, output.swf will be used)\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("-o outputfile       --output    explicitly specify output file. (otherwise, output.swf will be used\n");
+    printf("-t                  --stack     place each slave in a seperate frame (no master movie\n");
+    printf("-T                  --stack1    place each slave in the first frame (no master movie\n");
+    printf("-m                  --merge     Don't store the slaves in Sprites/MovieClips\n");
+    printf("-a                  --cat       concatenate all slave files (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("-f                  --frame     The following identifier is a frame or framelabel, not an id or objectname\n");
+    printf("-x xpos             --movex     x Adjust position of slave by xpos twips (1/20 pixel\n");
+    printf("-y ypos             --movey     y Adjust position of slave by ypos twips (1/20 pixel\n");
+    printf("-s scale            --scale     Adjust size of slave by scale%\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 */
@@ -205,8 +267,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++)
     {
@@ -283,16 +343,19 @@ void makestackmaster(u8**masterdata, int*masterlength)
 	*(u16*)&pos[6] = 0; // TAG1
 	*(u16*)&pos[8] = (u16)(TAGID_PLACEOBJECT2<<6) + 6 + namelen;
 	*(u16*)&pos[10]= 34; //flags: id+name
-	*(u16*)&pos[11]= 1; // depth
+	*(u16*)&pos[11]= 1+t; // depth
 	*(u16*)&pos[13]= t+1; // id
 	sprintf(&pos[15],slave_name[t]);
 	pos += 15 + namelen + 1;
-	*(u16*)&pos[0]= (u16)(TAGID_SHOWFRAME<<6) + 0;
-	pos += 2;
+	if(!config.stack1 || t == numslaves-1) {
+	    *(u16*)&pos[0]= (u16)(TAGID_SHOWFRAME<<6) + 0;
+	    pos += 2;
+	}
+	if(!config.stack)
 	if(t!=numslaves-1)
 	{
 	    *(u16*)&pos[0]= (u16)(TAGID_REMOVEOBJECT2<<6) + 2;
-	    *(u16*)&pos[2]= 1; // depth;
+	    *(u16*)&pos[2]= 1+t; // depth;
 	    pos += 4;
 	}
     }
@@ -314,18 +377,33 @@ int main(int argn, char *argv[])
     int t;
 
     config.overlay = 0; 
+    config.antistream = 0; 
     config.alloctest = 0;
+    config.cat = 0;
+    config.merge = 0;
     config.clip = 0;
     config.loglevel = 2; 
     config.movex = 0;
     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.stack1 = 0;
+    config.dummy = 0;
 
     processargs(argn, argv);
     initLog(0,-1,0,0,-1,config.loglevel);
 
+    if(config.merge && config.cat) {
+	logf("<error> Can't combine --cat and --merge");
+	exit(1);
+    }
+
     if(config.stack) {
 
 	if(config.overlay) {
@@ -357,9 +435,24 @@ 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]);
+
+    for(t=0;t<numslaves;t++) {
+	    logf("<verbose> slave entity(%d) %s (%s \"%s\")\n", t+1, slave_filename[t], 
+		    slave_isframe[t]?"frame":"object", 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[0] = "!!dummy!!";
+	slave_name[0] = "!!dummy!!";
+	slave_isframe[0] = 0;
+    }
 
     if (config.alloctest)
     {
@@ -384,21 +477,39 @@ int main(int argn, char *argv[])
 	    config.movey = slave_movey[t];
 	    config.scalex = slave_scalex[t];
 	    config.scaley = slave_scaley[t];
+	    config.isframe = slave_isframe[t];
 
 	    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) {