[Gnash-commit] /srv/bzr/gnash/trunk r11617: Drop unused loadLevel method from movie_root

[Sandro Santilli]

------------------------------------------------------------
revno: 11617 [merge]
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Wed 2009-11-11 00:28:57 +0100
message:
  Drop unused loadLevel method from movie_root
modified:
  libcore/movie_root.cpp
  libcore/movie_root.h

=== modified file 'libcore/movie_root.cpp'
--- a/libcore/movie_root.cpp    2009-11-10 00:59:35 +0000
+++ b/libcore/movie_root.cpp    2009-11-10 20:16:03 +0000
@@ -460,37 +460,6 @@
        assert(testInvariant());
 }
 
-bool
-movie_root::loadLevel(unsigned int num, const URL& url)
-{
-       movie_definition* md (
-            MovieFactory::makeMovie(url, _runResources));
-       if (!md)
-       {
-               log_error(_("can't create movie_definition for %s"), url.str());
-               return false;
-       }
-
-       Movie* extern_movie = md->createMovie(*_vm.getGlobal());
-
-       if (!extern_movie) {
-               log_error(_("can't create extern Movie for %s"),
-                url.str());
-               return false;
-       }
-
-       // Parse query string
-       MovieClip::MovieVariables vars;
-       url.parse_querystring(url.querystring(), vars);
-       
-    extern_movie->setVariables(vars);
-       extern_movie->set_depth(num + DisplayObject::staticDepthOffset);
-
-       setLevel(num, extern_movie);
-
-       return true;
-}
-
 void
 movie_root::replaceLevel(unsigned int num, Movie* extern_movie)
 {
@@ -2310,7 +2279,9 @@
             getObject(targetDO));
 
         // Dispatch onLoadProgress
-        // FIXME: should be signalled every 65535 bytes ?
+        // FIXME: should be signalled on every readNonBlocking()
+        //        with a buffer size of 65535 bytes.
+        //
         size_t bytesLoaded = md->get_bytes_loaded();
         size_t bytesTotal = md->get_bytes_total();
         handler->callMethod(NSV::PROP_BROADCAST_MESSAGE, "onLoadProgress",

=== modified file 'libcore/movie_root.h'
--- a/libcore/movie_root.h      2009-11-10 00:07:05 +0000
+++ b/libcore/movie_root.h      2009-11-10 18:45:16 +0000
@@ -186,22 +186,6 @@
     ///
     Movie* getLevel(unsigned int num) const;
 
-    /// Load movie at the specified URL in the given level 
-    //
-    /// Note that the display viewport will be updated to reflect
-    /// the new layout.
-    ///
-    /// @param num
-    /// The level number to load into.
-    ///
-    /// @param url
-    /// The url to load the movie from.
-    /// Can contain a query string, which would be parsed.
-    ///
-    /// @return false on error, true on success
-    ///
-    bool loadLevel(unsigned int num, const URL& url);
-
     /// Replace an existing level with a new movie
     //
     /// Depth will be assigned to external_movie by this function.