char cat;
char merge;
char isframe;
+ char local_with_networking;
+ char local_with_filesystem;
int loglevel;
int sizex;
char hassizex;
int sizey;
char hassizey;
+ int flashversion;
int framerate;
int movex;
int movey;
config.scaley = atoi(val)/100.0;
return 1;
}
+ else if (!strcmp(name, "N"))
+ {
+ config.local_with_networking = 1;
+ return 0;
+ }
+ else if (!strcmp(name, "L"))
+ {
+ config.local_with_filesystem = 1;
+ return 0;
+ }
else if (!strcmp(name, "t") || !strcmp(name, "T"))
{
if(master_filename) {
{"o", "output"},
{"t", "stack"},
{"T", "stack1"},
+{"F", "version"},
{"m", "merge"},
{"a", "cat"},
{"l", "overlay"},
{"r", "rate"},
{"X", "width"},
{"Y", "height"},
+{"N", "local-with-networking"},
+{"L", "local-with-filesystem"},
{"z", "zlib"},
{0,0}
};
printf("-f , --frame The following identifier is a frame or framelabel, not an id or objectname\n");
printf("-x , --movex <xpos> x Adjust position of slave by <xpos> pixels\n");
printf("-y , --movey <ypos> y Adjust position of slave by <ypos> pixels\n");
- printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100%% = original size)\n");
+ printf("-s , --scale <scale> Adjust size of slave by <scale> percent (e.g. 100% = original size)\n");
printf("-r , --rate <fps> Set movie framerate to <fps> (frames/sec)\n");
printf("-X , --width <width> Force movie bbox width to <width> (default: use master width (not with -t))\n");
printf("-Y , --height <height> Force movie bbox height to <height> (default: use master height (not with -t))\n");
+ printf("-N , --local-with-networking Make output file \"local-with-networking\"\n");
+ printf("-L , --local-with-filesystem Make output file \"local-with-filesystem\"\n");
printf("-z , --zlib <zlib> Enable Flash 6 (MX) Zlib Compression\n");
printf("\n");
}
swf->movieSize.ymax =
swf->movieSize.ymin + config.sizey;
}
+ if(config.flashversion)
+ swf->fileVersion = config.flashversion;
}
void catcombine(SWF*master, char*slave_name, SWF*slave, SWF*newswf)
msg("<fatal> Can't combine --cat and --frame");
exit(1);
}
+ if(config.flashversion)
+ master->fileVersion = config.flashversion;
tag = master->firstTag;
while(tag)
msg("<notice> Slave file attached to object %d.", defineid);
}
}
+ } else if(tag->id == ST_SYMBOLCLASS) {
+ /* a symbolclass tag is like a define tag: it defines id 0000 */
+ int num = swf_GetU16(tag);
+ int t;
+ for(t=0;t<num;t++) {
+ U16 id = swf_GetU16(tag);
+ if(!id) {
+ masterbitmap[id] = 1;
+ }
+ swf_GetString(tag);
+ }
} else if(tag->id == ST_PLACEOBJECT2) {
char * name = swf_GetName(tag);
int id = swf_GetPlaceID(tag);
if (spriteid<0 && !config.isframe) {
if(slavename) {
- if(strcmp(slavename,"!!dummy!!"))
+ if(strcmp(slavename,"!!dummy!!")) {
msg("<warning> Didn't find anything named %s in file. No substitutions will occur.", slavename);
+ if(!strcmp(slavename, "swf")) {
+ msg("<warning> (If you were trying to combine rfxview with a document, try replacing 'swf' with 'viewport'.");
+ }
+ }
}
else
msg("<warning> Didn't find id %d in file. No substitutions will occur.", slaveid);
}
swf_Relocate (slave, masterbitmap);
+
if(config.merge)
swf_RelocateDepth (slave, depthbitmap);
jpeg_assert(slave, master);
if(!newswf.fileVersion)
newswf.fileVersion = 4;
+ if(config.local_with_filesystem)
+ newswf.fileAttributes &= ~FILEATTRIBUTE_USENETWORK;
+ if(config.local_with_networking)
+ newswf.fileAttributes |= FILEATTRIBUTE_USENETWORK;
+
fi = open(outputname, O_BINARY|O_RDWR|O_TRUNC|O_CREAT, 0777);
if(config.zlib) {