[Gnash-commit] gnash ./ChangeLog server/impl.cpp server/movie_...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/09 17:43:38

Modified files:
        .              : ChangeLog 
        server         : impl.cpp movie_def_impl.cpp movie_def_impl.h 
                         movie_definition.h sprite_definition.h 
                         sprite_instance.cpp xmlattrs.h 

Log message:
        * server/movie_definition.h: added get_url() virtual method
        * server/movie_def_impl.cpp, server/movie_def_impl.h:
        implemented get_url() method, added url argument to the
        read() method.
        * server/sprite_definition.h, server/sprite_instance.cpp:
        implemented get_url() method.
        * server/impl.cpp: updated movie_def_impl constructions to
        pass the url method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.285&tr2=1.286&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/impl.cpp.diff?tr1=1.35&tr2=1.36&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.cpp.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_def_impl.h.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/movie_definition.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_definition.h.diff?tr1=1.6&tr2=1.7&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/sprite_instance.cpp.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/server/xmlattrs.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.285 gnash/ChangeLog:1.286
--- gnash/ChangeLog:1.285       Tue May  9 17:08:51 2006
+++ gnash/ChangeLog     Tue May  9 17:43:38 2006
@@ -1,5 +1,15 @@
 2006-05-09 Sandro Santilli <address@hidden>
 
+       * server/movie_definition.h: added get_url() virtual method
+       * server/movie_def_impl.cpp, server/movie_def_impl.h:
+       implemented get_url() method, added url argument to the
+       read() method.
+       * server/sprite_definition.h, server/sprite_instance.cpp:
+       implemented get_url() method.
+       * server/impl.cpp: updated movie_def_impl constructions to
+       pass the url method.
+       * server/xmlattrs.h: fixed compiler warning about %p format used
+       for non-void pointer.
        * libbase/zlib_adapter.h: doxygen comments
        * server/stream.h, server/stream.cpp: doxygen comments
        * server/sprite_definition.h, server/sprite_definition.cpp,
Index: gnash/server/impl.cpp
diff -u gnash/server/impl.cpp:1.35 gnash/server/impl.cpp:1.36
--- gnash/server/impl.cpp:1.35  Tue May  9 15:34:16 2006
+++ gnash/server/impl.cpp       Tue May  9 17:43:38 2006
@@ -400,8 +400,9 @@
 
     ensure_loaders_registered();
 
-    movie_def_impl*    m = new movie_def_impl(DO_LOAD_BITMAPS, 
DO_LOAD_FONT_SHAPES);
-    m->read(in);
+       movie_def_impl* m = new movie_def_impl(DO_LOAD_BITMAPS,
+               DO_LOAD_FONT_SHAPES);
+       m->read(in, filename);
 
     delete in;
 
@@ -436,6 +437,7 @@
 bool   s_no_recurse_while_loading = false;     // @@ TODO get rid of this; 
make it the normal mode.
 
 
+#if 0 // This function seems unused
 movie_definition*      create_movie_no_recurse(
     tu_file* in,
     create_bitmaps_flag cbf,
@@ -458,6 +460,7 @@
     m->add_ref();
     return m;
 }
+#endif
 
 
 //
Index: gnash/server/movie_def_impl.cpp
diff -u gnash/server/movie_def_impl.cpp:1.6 gnash/server/movie_def_impl.cpp:1.7
--- gnash/server/movie_def_impl.cpp:1.6 Tue May  9 16:07:52 2006
+++ gnash/server/movie_def_impl.cpp     Tue May  9 17:43:38 2006
@@ -309,8 +309,13 @@
 
 
 // Read a .SWF movie.
-void movie_def_impl::read(tu_file* in)
+void movie_def_impl::read(tu_file* in, const std::string& url)
 {
+
+       assert(_url == "");
+       if ( url == "" ) _url = "<anonymous>";
+       else _url = url;
+
     uint32_t   file_start_pos = in->get_position();
     uint32_t   header = in->read_le32();
     m_file_length = in->read_le32();
Index: gnash/server/movie_def_impl.h
diff -u gnash/server/movie_def_impl.h:1.4 gnash/server/movie_def_impl.h:1.5
--- gnash/server/movie_def_impl.h:1.4   Tue May  9 15:34:16 2006
+++ gnash/server/movie_def_impl.h       Tue May  9 17:43:38 2006
@@ -50,7 +50,9 @@
 #include "character_def.h" // for smart_ptr visibility of dtor
 #include "bitmap_character_def.h" // for smart_ptr visibility of dtor
 #include "resource.h" // for smart_ptr visibility of dtor
+
 #include <map> // for CharacterDictionary
+#include <string>
 
 namespace gnash
 {
@@ -192,6 +194,8 @@
 
        jpeg::input*    m_jpeg_in;
 
+       std::string _url;
+
 public:
        movie_def_impl(create_bitmaps_flag cbf,
                        create_font_shapes_flag cfs)
@@ -387,7 +391,10 @@
        /// This function uses the gnash::s_tag_loaders
        /// global variable to interpret specific tag types.
        ///
-       void read(tu_file *in);
+       /// @param in the tu_file from which to read SWF
+       /// @param url the url associated with the input
+       ///
+       void read(tu_file *in, const std::string& url);
 
        /// Fill up *fonts with fonts that we own.
        void get_owned_fonts(std::vector<font*>* fonts);
@@ -411,6 +418,8 @@
        /// will be set to a newly created sprite_instace (Help!)
        ///
        movie_interface* create_instance();
+
+       virtual const std::string& get_url() const { return _url; }
 };
 
 } // namespace gnash
Index: gnash/server/movie_definition.h
diff -u gnash/server/movie_definition.h:1.3 gnash/server/movie_definition.h:1.4
--- gnash/server/movie_definition.h:1.3 Tue May  9 10:41:44 2006
+++ gnash/server/movie_definition.h     Tue May  9 17:43:38 2006
@@ -71,6 +71,8 @@
 #include "jpeg.h"
 #include "tu_file.h"
 
+#include <string>
+
 namespace gnash
 {
 
@@ -207,6 +209,11 @@
 
        virtual create_bitmaps_flag     get_create_bitmaps() const = 0;
        virtual create_font_shapes_flag get_create_font_shapes() const = 0;
+
+       /// \brief
+       /// Return the URL of the SWF stream this definition has been read
+       /// from.
+       virtual const std::string& get_url() const = 0;
 };
 
 } // namespace gnash
Index: gnash/server/sprite_definition.h
diff -u gnash/server/sprite_definition.h:1.6 
gnash/server/sprite_definition.h:1.7
--- gnash/server/sprite_definition.h:1.6        Tue May  9 16:07:52 2006
+++ gnash/server/sprite_definition.h    Tue May  9 17:43:38 2006
@@ -216,6 +216,10 @@
            return NULL;
        }
 
+       virtual const std::string& get_url() const
+       {
+           return m_movie_def->get_url();
+       }
 
 };
 
Index: gnash/server/sprite_instance.cpp
diff -u gnash/server/sprite_instance.cpp:1.3 
gnash/server/sprite_instance.cpp:1.4
--- gnash/server/sprite_instance.cpp:1.3        Tue May  9 15:34:16 2006
+++ gnash/server/sprite_instance.cpp    Tue May  9 17:43:38 2006
@@ -317,8 +317,9 @@
 // sprite_instance
 //------------------------------------------------
 
-sprite_instance::sprite_instance(movie_definition* def,
-               movie_root* r, movie* parent, int id)
+sprite_instance::sprite_instance(
+               movie_definition* def, movie_root* r,
+               movie* parent, int id)
        :
        character(parent, id),
        m_mouse_state(UP),
@@ -539,7 +540,7 @@
                // we might use the actions creating
                // it as defining where was it "downloaded" from.
                //
-           val->set_string("gnash");
+           val->set_string(m_def->get_url().c_str()); // "gnash"
            return true;
        }
        case M_HIGHQUALITY:
Index: gnash/server/xmlattrs.h
diff -u gnash/server/xmlattrs.h:1.3 gnash/server/xmlattrs.h:1.4
--- gnash/server/xmlattrs.h:1.3 Mon Apr 24 23:05:56 2006
+++ gnash/server/xmlattrs.h     Tue May  9 17:43:38 2006
@@ -68,7 +68,7 @@
     xmlAttributeType    _type;
     
     XMLAttr *operator = (XMLAttr node) {
-        log_msg("\t\tCopying XMLAttr object at %p\n", this);
+        log_msg("\t\tCopying XMLAttr object at %p\n", (void*)this);
     
         _name = new char[strlen(node._name)+2];
         memset(_name, 0, strlen(node._name)+2);