[Gnash-commit] /srv/bzr/gnash/rtmp r10082: Finish adding -P option support.

[rob]

------------------------------------------------------------
revno: 10082
committer: address@hidden
branch nick: rtmp
timestamp: Tue 2009-03-31 15:16:53 -0600
message:
  Finish adding -P option support.
modified:
  utilities/processor.cpp

=== modified file 'utilities/processor.cpp'
--- a/utilities/processor.cpp   2009-03-31 20:54:13 +0000
+++ b/utilities/processor.cpp   2009-03-31 21:16:53 +0000
@@ -112,9 +112,7 @@
 };
 
 // This is so we can use -P to set FlashVars
-typedef std::map<std::string, std::string> VariableMap;
-VariableMap flashVars;
-std::map<std::string, std::string> params;
+std::map<std::string, std::string> flashVars;
 
 static boost::intrusive_ptr<gnash::movie_definition> play_movie(
         const std::string& filename, const RunInfo& runInfo);
@@ -240,6 +238,7 @@
         { 'd', "delay",         Arg_parser::yes },
         { 'r', "runs",          Arg_parser::yes },
         { 'w', "waits",         Arg_parser::yes },
+        { 'P', "param",         Arg_parser::yes },
         { 'g', "gdb",           Arg_parser::no },
         { 'w', "waits",         Arg_parser::yes },
         { 'f', "frames",        Arg_parser::yes }
@@ -326,7 +325,7 @@
                      name = param.substr(0, eq);
                      value = param.substr(eq + 1);
                  }
-                 params[name] = value;
+                 flashVars[name] = value;
                  break;
              }
              case 'r':
@@ -499,7 +498,7 @@
 
     std::auto_ptr<movie_instance> mi ( md->create_movie_instance() );
 
-    mi->setVariables(flashVars); // set the variables passed as -P FLashVars
+    mi->setVariables(flashVars); // set the variables passed as -P FlashVars
 
     m.setRootMovie( mi.release() );
     if ( quitrequested )  // setRootMovie would execute actions in first frame
@@ -647,6 +646,7 @@
        "  --help(-h)  Print this info.\n"      
        "  --version   Print the version numbers.\n"    
        "  -w          Write a .gsc file with preprocessed info, for each input 
file.\n"        
+       "  -P,  --param <param>     Set parameter (e.g. \"FlashVars=A=1&b=2\")"
        "  -v          Be verbose; i.e. print log messages to stdout\n"
           ),
 #if VERBOSE_PARSE