[Gnash-commit] [SCM] Gnash branch, master, updated. f55364cbf17af6ddb49802d1c8f0938d30db687e

[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  f55364cbf17af6ddb49802d1c8f0938d30db687e (commit)
       via  f9af4376576d4e8d8ace60076173faf2fd8fe799 (commit)
       via  70b98ed0d7f2a14d37c37ab89b8bbdc887e8a7d1 (commit)
      from  fe4faf34f62b8ead1c5c48fa2d426e99fbd6c46a (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=f55364cbf17af6ddb49802d1c8f0938d30db687e


commit f55364cbf17af6ddb49802d1c8f0938d30db687e
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 5 10:06:15 2010 +0100

    Fix testsuite.

diff --git a/testsuite/libcore.all/AsValueTest.cpp 
b/testsuite/libcore.all/AsValueTest.cpp
index 7a4f4ff..021a383 100644
--- a/testsuite/libcore.all/AsValueTest.cpp
+++ b/testsuite/libcore.all/AsValueTest.cpp
@@ -111,9 +111,7 @@ main(int argc, char *argv[])
     movie_root stage(*md, clock, runResources);
 
     MovieClip::MovieVariables v;
-    // We pass 'v' twice, as the second one is for scriptable
-    // Variables, which isn't fully implemented yet.
-    stage.init(md, v, v);
+    stage.init(md, v);
 
     // run the tests
     test_isnan();
diff --git a/testsuite/libcore.all/DisplayListTest.cpp 
b/testsuite/libcore.all/DisplayListTest.cpp
index 2efdc18..4c8b388 100644
--- a/testsuite/libcore.all/DisplayListTest.cpp
+++ b/testsuite/libcore.all/DisplayListTest.cpp
@@ -63,9 +63,7 @@ main(int /*argc*/, char** /*argv*/)
     movie_root stage(*md5, clock, ri);
     
     MovieClip::MovieVariables v;
-    // We pass 'v' twice, as the second one is for scriptable
-    // Variables, which isn't fully implemented yet.
-    stage.init(md5.get(), v, v);
+    stage.init(md5.get(), v);
     
     DisplayList dlist1;
     
diff --git a/testsuite/libcore.all/PropertyListTest.cpp 
b/testsuite/libcore.all/PropertyListTest.cpp
index e3b8c12..39b5eda 100644
--- a/testsuite/libcore.all/PropertyListTest.cpp
+++ b/testsuite/libcore.all/PropertyListTest.cpp
@@ -82,10 +82,7 @@ main(int /*argc*/, char** /*argv*/)
 
     movie_root root(*md5, clock, runResources);
 
-    // We pass MovieClip::MovieVariables() twice, as the second one is
-    // for scriptable Variables, which isn't fully implemented yet.
-    root.init(md5.get(), MovieClip::MovieVariables(),
-             MovieClip::MovieVariables());
+    root.init(md5.get(), MovieClip::MovieVariables());
 
     VM& vm = root.getVM();
 

http://git.savannah.gnu.org/cgit//commit/?id=f9af4376576d4e8d8ace60076173faf2fd8fe799


commit f9af4376576d4e8d8ace60076173faf2fd8fe799
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 5 08:59:21 2010 +0100

    Don't pass things unnecessarily.

diff --git a/gui/Player.cpp b/gui/Player.cpp
index 91b2614..a2931e4 100644
--- a/gui/Player.cpp
+++ b/gui/Player.cpp
@@ -73,12 +73,6 @@ Player::setFlashVars(const std::string& varstr)
     _gui->addFlashVars(vars);
 }
 
-void
-Player::setScriptableVar(const std::string &name, const std::string &value)
-{
-    _gui->addScriptableVar(name, value);
-}
-
 Player::Player()
     :
 #if defined(RENDERER_CAIRO)
diff --git a/gui/Player.h b/gui/Player.h
index e928e18..089f749 100644
--- a/gui/Player.h
+++ b/gui/Player.h
@@ -276,8 +276,6 @@ private:
     
     void setFlashVars(const std::string& varstr);
 
-    void setScriptableVar(const std::string &name, const std::string& value);
-    
     typedef std::map<std::string, std::string, StringNoCaseLessThan> Params;
     
     // Movie parameters (for -P)
diff --git a/gui/gui.cpp b/gui/gui.cpp
index c377ee0..c9148eb 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -904,9 +904,8 @@ Gui::start()
         return;
     }
 
-    // Initializes the stage with a Movie and the passed flash vars and
-    // Scriptable vars for ExternalInterface.
-    _stage->init(_movieDef.get(), _flashVars, _scriptableVars);
+    // Initializes the stage with a Movie and the passed flash vars.
+    _stage->init(_movieDef.get(), _flashVars);
 
     bool background = true; // ??
     _stage->set_background_alpha(background ? 1.0f : 0.05f);
@@ -1275,14 +1274,6 @@ Gui::addFlashVars(Gui::VariableMap& from)
 }
 
 void
-Gui::addScriptableVar(const std::string &name, const std::string &value)
-{
-    log_debug("Adding scriptable variable \"%s\" = %s",
-              name, value);
-    _scriptableVars[name] = value;
-}
-
-void
 Gui::setMovieDefinition(movie_definition* md)
 {
     assert(!_movieDef);
diff --git a/gui/gui.h b/gui/gui.h
index 7db9235..ba9f15a 100644
--- a/gui/gui.h
+++ b/gui/gui.h
@@ -396,9 +396,6 @@ public:
     /// Add variables to set into instances of the top-level movie definition
     void addFlashVars(VariableMap& vars);
 
-    /// Add a variable used by ExternalInterface
-    void addScriptableVar(const std::string &name, const std::string &value);
-
     /// Set the definition of top-level movie
     void setMovieDefinition(movie_definition* md);
 
@@ -583,7 +580,6 @@ private:
 #endif // def GNASH_FPS_DEBUG
 
     VariableMap _flashVars;
-    VariableMap _scriptableVars;
 
     boost::intrusive_ptr<movie_definition> _movieDef;
     
diff --git a/gui/pythonmod/gnash-view.cpp b/gui/pythonmod/gnash-view.cpp
index 3569f77..1950903 100644
--- a/gui/pythonmod/gnash-view.cpp
+++ b/gui/pythonmod/gnash-view.cpp
@@ -467,8 +467,7 @@ gnash_view_load_movie(GnashView *view, const gchar *uri)
     std::map<std::string, std::string> variables;
     gnash::URL::parse_querystring(url.querystring(), variables);
 
-    gnash::Movie* m = view->stage->init(view->movie_definition.get(), 
variables,
-                                        variables);
+    gnash::Movie* m = view->stage->init(view->movie_definition.get(), 
variables);
     view->movie = m;
 
     view->stage->set_background_alpha(1.0f);
diff --git a/libcore/movie_root.cpp b/libcore/movie_root.cpp
index 7d243d7..404bb11 100644
--- a/libcore/movie_root.cpp
+++ b/libcore/movie_root.cpp
@@ -212,12 +212,10 @@ movie_root::~movie_root()
 }
 
 Movie*
-movie_root::init(movie_definition* def, const MovieClip::MovieVariables& vars,
-                 const MovieClip::MovieVariables& scriptables)
+movie_root::init(movie_definition* def, const MovieClip::MovieVariables& vars)
 {
     Movie* mr = def->createMovie(*_vm.getGlobal());
     mr->setVariables(vars);
-    mr->setVariables(scriptables);
     setRootMovie(mr);
     return mr;
 }
diff --git a/libcore/movie_root.h b/libcore/movie_root.h
index 2eaea7a..fabe555 100644
--- a/libcore/movie_root.h
+++ b/libcore/movie_root.h
@@ -191,8 +191,7 @@ public:
     /// SWF playback, so for normal playback this pointer should not be
     /// used.
     Movie* init(movie_definition* def,
-            const MovieClip::MovieVariables& variables,
-            const MovieClip::MovieVariables& scriptables);
+            const MovieClip::MovieVariables& variables);
 
     /// Return the movie at the given level (0 if unloaded level).
     //
diff --git a/testsuite/MovieTester.cpp b/testsuite/MovieTester.cpp
index 3519070..ce5dd85 100644
--- a/testsuite/MovieTester.cpp
+++ b/testsuite/MovieTester.cpp
@@ -143,9 +143,7 @@ MovieTester::MovieTester(const std::string& url)
     
     // Finally, place the root movie on the stage ...
     MovieClip::MovieVariables v;
-    // We pass 'v' twice, as the second one is for scriptable
-    // Variables, which isn't fully implemented yet.
-    _movie_root->init(_movie_def.get(), v, v);
+    _movie_root->init(_movie_def.get(), v);
     
     // ... and render it
     render();
@@ -599,9 +597,7 @@ MovieTester::restart()
 {
     _movie_root->reset(); 
     MovieClip::MovieVariables v;
-    // We pass 'v' twice, as the second one is for scriptable
-    // Variables, which isn't fully implemented yet.
-    _movie_root->init(_movie_def.get(), v, v);
+    _movie_root->init(_movie_def.get(), v);
     
     // Set _movie before calling ::render
     render();
diff --git a/utilities/processor.cpp b/utilities/processor.cpp
index 0782b33..aaa41ec 100644
--- a/utilities/processor.cpp
+++ b/utilities/processor.cpp
@@ -464,7 +464,7 @@ play_movie(const std::string& filename, const RunResources& 
runResources)
     md->completeLoad();
 
     MovieClip::MovieVariables v;
-    m.init(md.get(), v, v);
+    m.init(md.get(), v);
 
     log_debug("iteration, timer: %lu, localDelay: %ld\n",
             cl.elapsed(), localDelay);

http://git.savannah.gnu.org/cgit//commit/?id=70b98ed0d7f2a14d37c37ab89b8bbdc887e8a7d1


commit 70b98ed0d7f2a14d37c37ab89b8bbdc887e8a7d1
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Nov 5 08:44:51 2010 +0100

    Drop obsolete sections of code.

diff --git a/libcore/ExternalInterface.cpp b/libcore/ExternalInterface.cpp
index 2c1b321..0fcddfa 100644
--- a/libcore/ExternalInterface.cpp
+++ b/libcore/ExternalInterface.cpp
@@ -145,26 +145,6 @@ ExternalInterface::ExternalEventCheck(int fd)
     boost::shared_ptr<ExternalInterface::invoke_t> error;
 
     if (fd > 0) {
-#if 0
-        fd_set fdset;
-        FD_ZERO(&fdset);
-        FD_SET(fd, &fdset);
-        struct timeval tval;
-        tval.tv_sec  = 0;
-        tval.tv_usec = 100;
-        errno = 0;
-        int ret1 = ::select(fd+1, &fdset, NULL, NULL, &tval);
-        if (ret1 == 0) {
-//            log_debug ("The pipe for fd #%d timed out waiting to read", fd);
-            return error;
-        } else if (ret1 == 1) {
-            log_debug ("The pipe for fd #%d is ready", fd);
-        } else {
-            log_error("The pipe has this error: %s", strerror(errno));
-            return error;
-        }
-#endif
-        
         int bytes = 0;
         ioctlSocket(fd, FIONREAD, &bytes);
         if (bytes == 0) {
@@ -480,19 +460,6 @@ ExternalInterface::readBrowser(int fd)
     // Wait for some data from the player
     int bytes = 0;
 
-#if 0
-    fd_set fdset;
-    FD_ZERO(&fdset);
-    FD_SET(fd, &fdset);
-    struct timeval tval;
-    tval.tv_sec = 10;
-    tval.tv_usec = 0;
-    // log_debug("Waiting for data... ");
-    if (::select(fd + 1, &fdset, NULL, NULL, &tval)) {
-        // log_debug("There is data in the network");
-    }  
-#endif
-
     ioctlSocket(fd, FIONREAD, &bytes);
 
     // No data yet

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

Summary of changes:
 gui/Player.cpp                             |    6 -----
 gui/Player.h                               |    2 -
 gui/gui.cpp                                |   13 +---------
 gui/gui.h                                  |    4 ---
 gui/pythonmod/gnash-view.cpp               |    3 +-
 libcore/ExternalInterface.cpp              |   33 ----------------------------
 libcore/movie_root.cpp                     |    4 +--
 libcore/movie_root.h                       |    3 +-
 testsuite/MovieTester.cpp                  |    8 +-----
 testsuite/libcore.all/AsValueTest.cpp      |    4 +--
 testsuite/libcore.all/DisplayListTest.cpp  |    4 +--
 testsuite/libcore.all/PropertyListTest.cpp |    5 +---
 utilities/processor.cpp                    |    2 +-
 13 files changed, 11 insertions(+), 80 deletions(-)


hooks/post-receive
-- 
Gnash