[Gnash-commit] [SCM] Gnash branch, master, updated. 060d1a1c7a672b9e79ddcb7aafd4283a49f55fe3

[Benjamin Wolsey]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  060d1a1c7a672b9e79ddcb7aafd4283a49f55fe3 (commit)
      from  395aa7dd1a3a0d7ce10535eed19e7a8917e09b8d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=060d1a1c7a672b9e79ddcb7aafd4283a49f55fe3


commit 060d1a1c7a672b9e79ddcb7aafd4283a49f55fe3
Author: Benjamin Wolsey <address@hidden>
Date:   Sat Nov 13 10:57:32 2010 +0100

    Allow multiple -P options again.

diff --git a/gui/gnash.cpp b/gui/gnash.cpp
index 55e8b1a..f461deb 100644
--- a/gui/gnash.cpp
+++ b/gui/gnash.cpp
@@ -68,7 +68,8 @@ namespace {
     po::options_description getSupportedOptions(gnash::Player& p);
 
     void setupSoundAndRendering(gnash::Player& p, int i);
-    void setupFlashVars(gnash::Player& p, const std::string& param);
+    void setupFlashVars(gnash::Player& p,
+        const std::vector<std::string>& params);
     void setupFDs(gnash::Player& p, const std::string& fds);
 
     void usage_gui_keys(std::ostream& os);
@@ -247,16 +248,20 @@ main(int argc, char *argv[])
 namespace {
 
 void
-setupFlashVars(gnash::Player& p, const std::string& param)
+setupFlashVars(gnash::Player& p, const std::vector<std::string>& params)
 {
-    const size_t eq = param.find("=");
-    if (eq == std::string::npos) {
-        p.setParam(param, "true");
-        return;
+    for (std::vector<std::string>::const_iterator i = params.begin(), 
+        e = params.end(); i != e; ++i) {
+        const std::string& param = *i;
+        const size_t eq = param.find("=");
+        if (eq == std::string::npos) {
+            p.setParam(param, "true");
+            return;
+        }
+        const std::string name = param.substr(0, eq);
+        const std::string value = param.substr(eq + 1);
+        p.setParam(name, value);
     }
-    const std::string name = param.substr(0, eq);
-    const std::string value = param.substr(eq + 1);
-    p.setParam(name, value);
 }
 
 void
@@ -442,7 +447,7 @@ getSupportedOptions(gnash::Player& p)
         ->notifier(boost::bind(&Player::setBaseUrl, &p, _1)),
         _("Set \"base\" URL for resolving relative URLs"))
 
-    ("param,P", po::value<string>()
+    ("param,P", po::value<std::vector<std::string> >()
         ->composing()
         ->notifier(boost::bind(&setupFlashVars, boost::ref(p), _1)),
         _("Set parameter (e.g. \"FlashVars=A=1&b=2\")"))

-----------------------------------------------------------------------

Summary of changes:
 gui/gnash.cpp |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
Gnash