[Gnash-commit] gnash ChangeLog server/movie_root.cpp server/mo...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/04/03 16:32:05

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

Log message:
                * server/movie_root.{cpp,h}: limit the number of interval
                  timers to 255.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2765&r2=1.2766
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.cpp?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/server/movie_root.h?cvsroot=gnash&r1=1.45&r2=1.46

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2765
retrieving revision 1.2766
diff -u -b -r1.2765 -r1.2766
--- ChangeLog   3 Apr 2007 16:17:44 -0000       1.2765
+++ ChangeLog   3 Apr 2007 16:32:04 -0000       1.2766
@@ -1,5 +1,7 @@
 2007-04-03 Sandro Santilli <address@hidden>
 
+       * server/movie_root.{cpp,h}: limit the number of interval
+         timers to 255.
        * server/asobj/xmlsocket.{cpp,h}: more cleanups and fix for
          polling from the socket.
        * libbase/network.{cpp,h}: do not allow assignment, cleanup

Index: server/movie_root.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- server/movie_root.cpp       3 Apr 2007 16:13:07 -0000       1.53
+++ server/movie_root.cpp       3 Apr 2007 16:32:05 -0000       1.54
@@ -512,6 +512,10 @@
        assert(testInvariant());
                        
        int id = _intervalTimers.size()+1;
+       if ( _intervalTimers.size() >= 255 )
+       {
+               log_error("FIXME: %u timers currently active, won't add another 
one", _intervalTimers.size());
+       }
 
        // TODO: find first NULL element in vector for reuse ?
        _intervalTimers.push_back(timer);

Index: server/movie_root.h
===================================================================
RCS file: /sources/gnash/gnash/server/movie_root.h,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -b -r1.45 -r1.46
--- server/movie_root.h 2 Apr 2007 17:22:29 -0000       1.45
+++ server/movie_root.h 3 Apr 2007 16:32:05 -0000       1.46
@@ -14,7 +14,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-/* $Id: movie_root.h,v 1.45 2007/04/02 17:22:29 strk Exp $ */
+/* $Id: movie_root.h,v 1.46 2007/04/03 16:32:05 strk Exp $ */
 
 /// \page events_handling Handling of user events
 ///
@@ -297,9 +297,10 @@
        float   get_timer() const { return m_timer; }
        
        /// Sets the current movie timer in seconds.
-       ///
+       //
        /// (Udo): I think getTimer() should be handled *completely* 
   /// in the AS VM... 
+       ///
        void set_timer(float value) { m_timer = value; }
 
        /// Delegate to current top-level root sprite