[Gnash-commit] gnash ChangeLog server/dlist.cpp server/dlist.h...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/02 09:31:52

Modified files:
        .              : ChangeLog 
        server         : dlist.cpp dlist.h movie_root.cpp 

Log message:
                * server/dlist.{cpp,h} (remove_display_object): call
                  unload on removed character.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2743&r2=1.2744
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.cpp?cvsroot=gnash&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/gnash/server/dlist.h?cvsroot=gnash&r1=1.29&r2=1.30
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.48&r2=1.49

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2743
retrieving revision 1.2744
diff -u -b -r1.2743 -r1.2744
--- ChangeLog   2 Apr 2007 09:12:48 -0000       1.2743
+++ ChangeLog   2 Apr 2007 09:31:52 -0000       1.2744
@@ -1,5 +1,7 @@
 2007-04-02 Sandro Santilli <address@hidden>
 
+       * server/dlist.{cpp,h} (remove_display_object): call
+         unload on removed character.
        * server/: character.h, sprite_instance.{cpp,h}:
          Moved the isUnloaded()/_unloaded logic from sprite_instance
          up to character.

Index: server/dlist.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.cpp,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- server/dlist.cpp    30 Mar 2007 13:41:10 -0000      1.54
+++ server/dlist.cpp    2 Apr 2007 09:31:52 -0000       1.55
@@ -368,14 +368,15 @@
 #endif
 
        // TODO: optimize to take by-depth order into account
-       container_type::iterator new_end = remove_if(
+       container_type::iterator it = find_if(
                        _characters.begin(),
                        _characters.end(),
                        DepthEquals(depth));
 
-       if ( new_end != _characters.end() )
+       if ( it != _characters.end() )
        {
-               _characters.erase(new_end, _characters.end());
+               (*it)->unload();
+               _characters.erase(it);
 
        }
 

Index: server/dlist.h
===================================================================
RCS file: /sources/gnash/gnash/server/dlist.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- server/dlist.h      28 Feb 2007 17:25:26 -0000      1.29
+++ server/dlist.h      2 Apr 2007 09:31:52 -0000       1.30
@@ -126,7 +126,7 @@
 
        /// Removes the object at the specified depth.
        //
-       /// Does *not* calls UNLOAD event 
+       /// Calls unload on the removed character.
        ///
        void    remove_display_object(uint16_t depth);
 

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- server/movie_root.cpp       2 Apr 2007 09:12:48 -0000       1.48
+++ server/movie_root.cpp       2 Apr 2007 09:31:52 -0000       1.49
@@ -604,7 +604,7 @@
 
 void movie_root::notify_keypress_listeners(key::code k)
 {
-       //log_msg("Notifying %u keypress listeners", 
m_keypress_listeners.size());
+       log_msg("Notifying %u keypress listeners", m_keypress_listeners.size());
        for (ListenerSet::iterator iter = m_keypress_listeners.begin();
                         iter != m_keypress_listeners.end(); ++iter)
        {