[Gnash-commit] gnash ChangeLog gui/Player.cpp server/swf/tag_l...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/10/02 17:14:41

Modified files:
        .              : ChangeLog 
        gui            : Player.cpp 
        server/swf     : tag_loaders.cpp 

Log message:
                * gui/Player.cpp (run): set base url before parsing.
                * server/swf/tag_loaders.cpp (import_loader):
                resolve relative urls against base url

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.995&r2=1.996
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Player.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.51&r2=1.52

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.995
retrieving revision 1.996
diff -u -b -r1.995 -r1.996
--- ChangeLog   2 Oct 2006 17:12:58 -0000       1.995
+++ ChangeLog   2 Oct 2006 17:14:41 -0000       1.996
@@ -1,5 +1,8 @@
 2006-10-02 Sandro Santilli  <address@hidden>
 
+       * gui/Player.cpp (run): set base url before parsing.
+       * server/swf/tag_loaders.cpp (import_loader):
+       resolve relative urls against base url 
        * server/ActionExec.cpp: more SIZET_FMT usage.
        * server/samples => testsuite/samples:
        moved sample movies under testsuite.

Index: gui/Player.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/Player.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/Player.cpp      2 Oct 2006 13:23:10 -0000       1.13
+++ gui/Player.cpp      2 Oct 2006 17:14:41 -0000       1.14
@@ -289,6 +289,8 @@
        // which is *required* during movie loading
        _gui->init(argc, &argv);
 
+       // Set base url for this movie (needed before parsing)
+       gnash::set_base_url(URL(_baseurl));
 
        // Load the actual movie.
        _movie_def = load_movie();
@@ -297,9 +299,6 @@
                return EXIT_FAILURE;
        }
 
-       // Set base url for this run/play
-       gnash::set_base_url(URL(_baseurl));
-
 
     // Get info about the width & height of the movie.
     int movie_width = static_cast<int>(_movie_def->get_width_pixels());

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- server/swf/tag_loaders.cpp  2 Oct 2006 16:28:12 -0000       1.51
+++ server/swf/tag_loaders.cpp  2 Oct 2006 17:14:41 -0000       1.52
@@ -36,7 +36,7 @@
 //
 //
 
-/* $Id: tag_loaders.cpp,v 1.51 2006/10/02 16:28:12 bjacques Exp $ */
+/* $Id: tag_loaders.cpp,v 1.52 2006/10/02 17:14:41 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -1384,9 +1384,12 @@
     char*      source_url = in->read_string();
     int        count = in->read_u16();
 
+    // Resolve relative urls against baseurl
+    URL abs_url(source_url, get_base_url());
+
                IF_VERBOSE_PARSE
                (
-    log_parse("  import: source_url = %s, count = %d", source_url, count);
+    log_parse("  import: source_url = %s (%s), count = %d", 
abs_url.str().c_str(), source_url, count);
                );
 
     // Try to load the source movie into the movie library.
@@ -1395,7 +1398,7 @@
     if (s_no_recurse_while_loading == false)
        {
                try {
-                       source_movie = create_library_movie(URL(source_url));
+                       source_movie = create_library_movie(abs_url);
                } catch (gnash::GnashException& e) {
                        log_error("%s\n", e.what());
                        source_movie = NULL;
@@ -1403,7 +1406,7 @@
                if (source_movie == NULL)
                {
                    // Give up on imports.
-                   log_error("can't import movie from url %s\n", source_url);
+                   log_error("can't import movie from url %s\n", 
abs_url.str().c_str());
                    return;
                }
        }