From a3da60beb347caba75475e3eaf50947497b99cd3 Mon Sep 17 00:00:00 2001 From: Matthias Kramm Date: Thu, 15 Jan 2009 00:30:22 +0100 Subject: [PATCH] added -L, -N options --- src/swfcombine.1 | 3 +++ src/swfcombine.c | 21 +++++++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/src/swfcombine.1 b/src/swfcombine.1 index cd98141..329b24b 100644 --- a/src/swfcombine.1 +++ b/src/swfcombine.1 @@ -110,3 +110,6 @@ swfcombine -o combined.swf master.swf foo=slave.swf As a result, the slave movie should be visible inside the master movie at the position where the rectangle used to be. +.SH AUTHOR + +Matthias Kramm diff --git a/src/swfcombine.c b/src/swfcombine.c index 44c251b..557e7bd 100644 --- a/src/swfcombine.c +++ b/src/swfcombine.c @@ -40,6 +40,8 @@ struct config_t char cat; char merge; char isframe; + char local_with_networking; + char local_with_filesystem; int loglevel; int sizex; char hassizex; @@ -171,6 +173,16 @@ int args_callback_option(char*name,char*val) { 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) { @@ -212,6 +224,8 @@ static struct options_t options[] = { {"r", "rate"}, {"X", "width"}, {"Y", "height"}, +{"N", "local-with-networking"}, +{"L", "local-with-filesystem"}, {"z", "zlib"}, {0,0} }; @@ -289,6 +303,8 @@ void args_callback_usage(char *name) printf("-r , --rate Set movie framerate to (frames/sec)\n"); printf("-X , --width Force movie bbox width to (default: use master width (not with -t))\n"); printf("-Y , --height Force movie bbox height to (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 Enable Flash 6 (MX) Zlib Compression\n"); printf("\n"); } @@ -1301,6 +1317,11 @@ int main(int argn, char *argv[]) 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) { -- 1.7.10.4