[Gnash-commit] gnash ChangeLog server/parser/sprite_definition.h

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/05 19:29:10

Modified files:
        .              : ChangeLog 
        server/parser  : sprite_definition.h 

Log message:
                * server/parser/sprite_definition.h (add_sound_sample): don't
                  complain about sound sampes definitions found in a sprite 
definition
                  context. That's completely legal.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3656&r2=1.3657
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sprite_definition.h?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3656
retrieving revision 1.3657
diff -u -b -r1.3656 -r1.3657
--- ChangeLog   5 Jul 2007 19:03:02 -0000       1.3656
+++ ChangeLog   5 Jul 2007 19:29:10 -0000       1.3657
@@ -1,5 +1,8 @@
 2007-07-05 Sandro Santilli <address@hidden>
 
+       * server/parser/sprite_definition.h (add_sound_sample): don't
+         complain about sound sampes definitions found in a sprite definition
+         context. That's completely legal.
        * server/array.cpp (array_concat): fix typo in function argument
          access. Fixes bug #20355.
        * testsuite/actionscript.all/array.as: add more tests for Array.concat()

Index: server/parser/sprite_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sprite_definition.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/parser/sprite_definition.h   2 Jul 2007 14:42:08 -0000       1.25
+++ server/parser/sprite_definition.h   5 Jul 2007 19:29:10 -0000       1.26
@@ -218,9 +218,9 @@
        /// Overridden just for complaining  about malformed SWF
        virtual void add_sound_sample(int id, sound_sample* sam)
        {
-               IF_VERBOSE_MALFORMED_SWF (
-               log_swferror(_("add sam appears in sprite tags"));
-               );
+               // DEFINESOUND tags *are* allowed in a sprite context,
+               // and it is *expected* for them to be registered into
+               // the main dictionary.
                m_movie_def->add_sound_sample(id,sam);
        }