CVSROOT: /sources/gnash Module name: gnash Changes by: Sandro Santilli <strk> 07/11/14 14:33:34
Modified files: . : ChangeLog server : sprite_instance.cpp video_stream_instance.cpp Log message: Remove some debugging output (compile-time defined) CVSWeb URLs: http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4858&r2=1.4859 http://cvs.savannah.gnu.org/viewcvs/gnash/server/sprite_instance.cpp?cvsroot=gnash&r1=1.383&r2=1.384 http://cvs.savannah.gnu.org/viewcvs/gnash/server/video_stream_instance.cpp?cvsroot=gnash&r1=1.42&r2=1.43 Patches: Index: ChangeLog =================================================================== RCS file: /sources/gnash/gnash/ChangeLog,v retrieving revision 1.4858 retrieving revision 1.4859 diff -u -b -r1.4858 -r1.4859 --- ChangeLog 14 Nov 2007 13:23:46 -0000 1.4858 +++ ChangeLog 14 Nov 2007 14:33:33 -0000 1.4859 @@ -1,5 +1,10 @@ 2007-11-14 Sandro Santilli <[EMAIL PROTECTED]> + * server/sprite_instance.cpp, server/video_stream_instance.cpp: + Remove some debugging output (compile-time defined) + +2007-11-14 Sandro Santilli <[EMAIL PROTECTED]> + * server/movie_root.{cpp,h}: add a processingActions method, might be used to know wheter to push actions or execute them immediately. Index: server/sprite_instance.cpp =================================================================== RCS file: /sources/gnash/gnash/server/sprite_instance.cpp,v retrieving revision 1.383 retrieving revision 1.384 diff -u -b -r1.383 -r1.384 --- server/sprite_instance.cpp 14 Nov 2007 13:23:47 -0000 1.383 +++ server/sprite_instance.cpp 14 Nov 2007 14:33:34 -0000 1.384 @@ -2433,7 +2433,9 @@ { if ( m_init_actions_executed.find(m_current_frame) == m_init_actions_executed.end() ) { +#ifdef GNASH_DEBUG log_debug("Queuing init actions in frame " SIZET_FMT " of sprite %s", m_current_frame, getTarget().c_str()); +#endif std::auto_ptr<ExecutableCode> code ( new GlobalCode(a, boost::intrusive_ptr<sprite_instance>(this)) ); // NOTE: we should really push these actions, but I still don't understand @@ -2451,7 +2453,9 @@ } else { +#ifdef GNASH_DEBUG log_debug("Init actions in frame " SIZET_FMT " of sprite %s already executed", m_current_frame, getTarget().c_str()); +#endif } } @@ -3389,15 +3393,22 @@ // if ( isDynamic() ) { - //log_debug("Sprite %s is dynamic, sending INITIALIZE and CONSTRUCT events immediately", getTarget().c_str()); +#ifdef GNASH_DEBUG + log_debug("Sprite %s is dynamic, sending INITIALIZE and CONSTRUCT events immediately", getTarget().c_str()); +#endif on_event(event_id::INITIALIZE); on_event(event_id::CONSTRUCT); } else { +#ifdef GNASH_DEBUG log_debug("Queuing INITIALIZE event for sprite %s", getTarget().c_str()); +#endif queueEvent(event_id::INITIALIZE, movie_root::apINIT); + +#ifdef GNASH_DEBUG log_debug("Queuing CONSTRUCT event for sprite %s", getTarget().c_str()); +#endif queueEvent(event_id::CONSTRUCT, movie_root::apCONSTRUCT); } @@ -3464,7 +3475,9 @@ } as_function* ctor = def->getRegisteredClass(); +#ifdef GNASH_DEBUG log_debug(_("Attached sprites %s registered class is %p"), getTarget().c_str(), (void*)ctor); +#endif // TODO: builtin constructors are different from user-defined ones // we should likely change that. See also vm/ASHandlers.cpp (construct_object) Index: server/video_stream_instance.cpp =================================================================== RCS file: /sources/gnash/gnash/server/video_stream_instance.cpp,v retrieving revision 1.42 retrieving revision 1.43 diff -u -b -r1.42 -r1.43 --- server/video_stream_instance.cpp 26 Oct 2007 18:43:36 -0000 1.42 +++ server/video_stream_instance.cpp 14 Nov 2007 14:33:34 -0000 1.43 @@ -17,7 +17,7 @@ // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA // -// $Id: video_stream_instance.cpp,v 1.42 2007/10/26 18:43:36 tgc Exp $ +// $Id: video_stream_instance.cpp,v 1.43 2007/11/14 14:33:34 strk Exp $ #include "sprite_instance.h" #include "video_stream_instance.h" @@ -162,11 +162,9 @@ _ns(NULL), _embeddedStream(false) { - log_debug("video_stream_instance %p ctor", (void*)this); - if ( m_def ) - { - _embeddedStream = true; - } + //log_debug("video_stream_instance %p ctor", (void*)this); + + if ( m_def ) _embeddedStream = true; set_prototype(getVideoInterface()); _______________________________________________ Gnash-commit mailing list Gnash-commit@gnu.org http://lists.gnu.org/mailman/listinfo/gnash-commit