[Gnash-commit] gnash ChangeLog server/vm/ASHandlers.cpp server...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/07 03:37:29

Modified files:
        .              : ChangeLog 
        server/vm      : ASHandlers.cpp action.cpp action.h 

Log message:
                * server/vm/ASHandlers.cpp (CommonGetUrl): use
                  sprite_instance::loadMovie for target loads.
                  Fixes bug #20001
                * server/vm/action.{cpp,h}: obsolete attach_extern_movie
                  in favor of sprite_instance::loadMovie, known to work
                  better in at least one case (bug #20001).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3667&r2=1.3668
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/ASHandlers.cpp?cvsroot=gnash&r1=1.110&r2=1.111
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/action.h?cvsroot=gnash&r1=1.6&r2=1.7

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3667
retrieving revision 1.3668
diff -u -b -r1.3667 -r1.3668
--- ChangeLog   6 Jul 2007 20:41:41 -0000       1.3667
+++ ChangeLog   7 Jul 2007 03:37:29 -0000       1.3668
@@ -1,3 +1,12 @@
+2007-07-06 Sandro Santilli <address@hidden>
+
+       * server/vm/ASHandlers.cpp (CommonGetUrl): use
+         sprite_instance::loadMovie for target loads.
+         Fixes bug #20001
+       * server/vm/action.{cpp,h}: obsolete attach_extern_movie
+         in favor of sprite_instance::loadMovie, known to work
+         better in at least one case (bug #20001).
+
 2007-07-06 Martin Guy <address@hidden>
 
        * backend/Makefile.am: Move a GUI test to its logical place

Index: server/vm/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/ASHandlers.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -u -b -r1.110 -r1.111
--- server/vm/ASHandlers.cpp    1 Jul 2007 10:54:36 -0000       1.110
+++ server/vm/ASHandlers.cpp    7 Jul 2007 03:37:29 -0000       1.111
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: ASHandlers.cpp,v 1.110 2007/07/01 10:54:36 bjacques Exp $ */
+/* $Id: ASHandlers.cpp,v 1.111 2007/07/07 03:37:29 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1870,8 +1870,7 @@
                                        sendVarsMethod);
                        }
 
-                       sprite_instance* root_movie = 
env.get_target()->get_root_movie();
-                       attach_extern_movie(url.str().c_str(), target_movie, 
root_movie);
+                       target_movie->loadMovie(url);
                }
        }
        else

Index: server/vm/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/vm/action.cpp        1 Jul 2007 10:54:37 -0000       1.22
+++ server/vm/action.cpp        7 Jul 2007 03:37:29 -0000       1.23
@@ -35,7 +35,7 @@
 #include "types.h"
 #include "sprite_instance.h"
 #include "movie_instance.h"
-#include "movie_root.h" // to reset root movie from attach_extern_movie
+//#include "movie_root.h" // to reset root movie from attach_extern_movie
 #include "Global.h"
 #include "swf.h"
 #include "URL.h"
@@ -127,6 +127,7 @@
        global->set_member(name, handler);
 }
 
+#if 0 // deprecated, use sprite_instance::loadMovie
 void
 attach_extern_movie(const char* c_url,
                const sprite_instance* target,
@@ -199,6 +200,7 @@
                clip_depth);
        }
 }
+#endif
 
 //
 // Function/method dispatch.

Index: server/vm/action.h
===================================================================
RCS file: /sources/gnash/gnash/server/vm/action.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/vm/action.h  1 Jul 2007 10:54:37 -0000       1.6
+++ server/vm/action.h  7 Jul 2007 03:37:29 -0000       1.7
@@ -143,7 +143,8 @@
        /// Returns M_INVALID_MEMBER if there's no match.
        as_standard_member      get_standard_member(const std::string& name);
 
-       void attach_extern_movie(const char* c_url, const sprite_instance* 
target, const sprite_instance* root_movie);
+       // deprecated, use sprite_instance::loadMovie
+       //void attach_extern_movie(const char* c_url, const sprite_instance* 
target, const sprite_instance* root_movie);
 
 }      // end namespace gnash