[Gnash-commit] gnash ChangeLog server/character.h server/video...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/08/18 16:12:38

Modified files:
        .              : ChangeLog 
        server         : character.h video_stream_instance.cpp 

Log message:
                * server/character.h (isDynamic): remove bogus assertion
                  failing for dynamically-loaded movies.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4030&r2=1.4031
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character.h?cvsroot=gnash&r1=1.87&r2=1.88
http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.34&r2=1.35

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4030
retrieving revision 1.4031
diff -u -b -r1.4030 -r1.4031
--- ChangeLog   18 Aug 2007 13:48:29 -0000      1.4030
+++ ChangeLog   18 Aug 2007 16:12:37 -0000      1.4031
@@ -1,3 +1,8 @@
+2007-08-18 Sandro Santilli <address@hidden>
+
+       * server/character.h (isDynamic): remove bogus assertion
+         failing for dynamically-loaded movies.
+
 2007-08-18 Petr Pisar <address@hidden>
 
        * po/cs.po: updated to version of 20070804

Index: server/character.h
===================================================================
RCS file: /sources/gnash/gnash/server/character.h,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -b -r1.87 -r1.88
--- server/character.h  9 Aug 2007 12:18:05 -0000       1.87
+++ server/character.h  18 Aug 2007 16:12:38 -0000      1.88
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: character.h,v 1.87 2007/08/09 12:18:05 zoulunkai Exp $ */
+/* $Id: character.h,v 1.88 2007/08/18 16:12:38 strk Exp $ */
 
 #ifndef GNASH_CHARACTER_H
 #define GNASH_CHARACTER_H
@@ -714,23 +714,32 @@
 
        /// Was this character dynamically created ?
        //
-       /// "Dynamically created" means created trough ActionScript
+       /// "Dynamically created" means created trough ActionScript.
+       ///
+       /// NOTE, With current code:
+       ///     - Characters created by means of a loadMovie are 
+       ///       NOT set as dynamic (should check if they should)
+       ///     - Characters created by attachMovie ARE dynamic
+       ///     - Characters created by duplicateMovieClip ARE dynamic
+       ///     - Characters created by new Video ARE dynamic
+       ///     - Characters created by createTextField ARE dynamic
+       ///
        ///
        bool isDynamic() const {
-               // TODO: return _timelineInfo.get() == NULL
+
                // WARNING: cannot use _timelinInfo for this, unless 
                // we'll provide a TimelineInfo object for top level movies
-               // (_level#) too... which would have no use except implementing
+               // (_level#) and dynamically loaded movies too...
+               // which would have no use except implementing
                // isDynamic(). Note that we have NO automated test for this, 
but
                // the "Magical Trevor 2" movie aborts due to a call to 
getBytesTotal
-               // against the root movie.
-#ifndef NDEBUG
-               if ( ! m_parent || _timelineInfo.get() ) 
assert(!_dynamicallyCreated);
-               else assert(_dynamicallyCreated);
-#endif
-               // TODO: _parent && !_timelineInfo.get() might work..
-               assert((m_parent && !_timelineInfo.get()) == 
_dynamicallyCreated);
-               //assert(_timelineInfo.get() ? !_dynamicallyCreated : 
_dynamicallyCreated);
+               // against the root movie, and bug #19844 show the effect with 
dynamically
+               // loaded movies.
+
+               // Anyway, any dynamically created character must NOT have a
+               // _timelineInfo object (see setDynamic)
+               assert(_dynamicallyCreated ? (_timelineInfo.get() == 0) : 1 );
+
                return _dynamicallyCreated;
        }
 

Index: server/video_stream_instance.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- server/video_stream_instance.cpp    6 Aug 2007 18:28:41 -0000       1.34
+++ server/video_stream_instance.cpp    18 Aug 2007 16:12:38 -0000      1.35
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 // 
 
-// $Id: video_stream_instance.cpp,v 1.34 2007/08/06 18:28:41 strk Exp $
+// $Id: video_stream_instance.cpp,v 1.35 2007/08/18 16:12:38 strk Exp $
 
 #include "sprite_instance.h"
 #include "video_stream_instance.h"
@@ -147,7 +147,8 @@
 
        // I'm not sure We can rely on the def and parent values being accepted 
 as NULL
        // Not till we add some testing...
-       boost::intrusive_ptr<as_object> obj = new video_stream_instance(NULL, 
NULL, -1);
+       boost::intrusive_ptr<character> obj = new video_stream_instance(NULL, 
NULL, -1);
+       obj->setDynamic();
        return as_value(obj.get()); // will keep alive
 }