X-Git-Url: http://git.asbjorn.biz/?a=blobdiff_plain;f=src%2Fswfdump.c;h=f90c7eb066a9208b5443acbf5374131ee07ffd05;hb=e028a6ae98c3b02bb56fab55d6bbe93905329ed5;hp=a20137f3db8cd677d53f12eb5c7d262c63a89526;hpb=82549e0d07e5eeba0e8b1e4c4e9cc2994b7d3dac;p=swftools.git

diff --git a/src/swfdump.c b/src/swfdump.c
index a20137f..f90c7eb 100644
--- a/src/swfdump.c
+++ b/src/swfdump.c
@@ -41,7 +41,9 @@ int xy = 0;
 struct options_t options[] =
 {
  {"a","action"},
- {"XY","size"},
+ {"X","width"},
+ {"Y","height"},
+ {"r","rate"},
  {"e","html"},
  {"v","verbose"},
  {"V","version"},
@@ -71,6 +73,10 @@ int args_callback_option(char*name,char*val)
 	xy |= 2;
 	return 0;
     }
+    else if(name[0]=='r') {
+	xy |= 4;
+	return 0;
+    }
     else {
         printf("Unknown option: -%s\n", name);
     }
@@ -88,6 +94,7 @@ void args_callback_usage(char*name)
     printf("-e , --html\t\t\t Create a html embedding the file (simple, but useful)\n");
     printf("-X , --width\t\t\t Prints out a string of the form \"-X width\"\n");
     printf("-Y , --height\t\t\t Prints out a string of the form \"-Y height\"\n");
+    printf("-r , --rate\t\t\t Prints out a string of the form \"-r rate\"\n");
     printf("-a , --action\t\t\t Disassemble action tags\n");
     printf("-V , --version\t\t\t Print program version and exit\n");
 }
@@ -158,10 +165,19 @@ int main (int argc,char ** argv)
     {
 	if(xy&1)
 	printf("-X %d", xsize);
-	if(xy==3)
+
+	if((xy&1) && (xy&6))
 	printf(" ");
+
 	if(xy&2)
 	printf("-Y %d", ysize);
+	
+	if((xy&3) && (xy&4))
+	printf(" ");
+
+	if(xy&4)
+	printf("-r %d", swf.frameRate*100/256);
+	
 	printf("\n");
 	return 0;
     }
@@ -170,7 +186,7 @@ int main (int argc,char ** argv)
  	printf("<OBJECT CLASSID=\"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000\"\n"
 	       " WIDTH=\"%d\"\n"
 	       " HEIGHT=\"%d\"\n"
-	       " CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=5,0,0,0\">\n"
+	       " CODEBASE=\"http://active.macromedia.com/flash5/cabs/swflash.cab#version=%d,0,0,0\">\n"
                "  <PARAM NAME=\"MOVIE\" VALUE=\"%s\">\n"
 	       "  <PARAM NAME=\"PLAY\" VALUE=\"true\">\n" 
 	       "  <PARAM NAME=\"LOOP\" VALUE=\"true\">\n"
@@ -179,7 +195,7 @@ int main (int argc,char ** argv)
 	       "   PLAY=\"true\" LOOP=\"true\" QUALITY=\"high\"\n"
 	       "   PLUGINSPAGE=\"http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash\">\n"
                "  </EMBED>\n" 
-	       "</OBJECT>\n", xsize, ysize, filename, filename, xsize, ysize);
+	       "</OBJECT>\n", xsize, ysize, swf.fileVersion, filename, filename, xsize, ysize);
 	return 0;
     } 
     printf("[HEADER]        File version: %d\n", swf.fileVersion);