[Gnash-commit] gnash ChangeLog server/parser/sound_definition....

[Benjamin Wolsey]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Benjamin Wolsey <bwy>   07/10/30 08:56:09

Modified files:
        .              : ChangeLog 
        server/parser  : sound_definition.cpp sound_definition.h 

Log message:
                * server/parser/sound_definition.{cpp,h}: move execute_state 
actions
                  to execute. Fixes bug #21465.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4738&r2=1.4739
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/sound_definition.h?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4738
retrieving revision 1.4739
diff -u -b -r1.4738 -r1.4739
--- ChangeLog   29 Oct 2007 21:23:15 -0000      1.4738
+++ ChangeLog   30 Oct 2007 08:56:08 -0000      1.4739
@@ -1,3 +1,8 @@
+2007-10-30 Benjamin Wolsey <address@hidden>
+
+       * server/parser/sound_definition.{cpp,h}: move execute_state actions
+         to execute. Fixes bug #21465.
+
 2007-10-30 Sandro Santilli <address@hidden>
 
        * server/character.h (setMask): set character as invalidated

Index: server/parser/sound_definition.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/parser/sound_definition.cpp  27 Aug 2007 12:44:28 -0000      1.5
+++ server/parser/sound_definition.cpp  30 Oct 2007 08:56:08 -0000      1.6
@@ -75,7 +75,7 @@
 
 
 void
-start_sound_tag::execute_state(sprite_instance* /* m */) const
+start_sound_tag::execute(sprite_instance* /* m */) const
 {
        // Make static ?
        sound_handler* handler = get_sound_handler();
@@ -111,7 +111,7 @@
 
 
 void
-start_stream_sound_tag::execute_state(sprite_instance* m) const
+start_stream_sound_tag::execute(sprite_instance* m) const
 {
        // Make static ?
        sound_handler* handler = get_sound_handler();

Index: server/parser/sound_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/sound_definition.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- server/parser/sound_definition.h    1 Jul 2007 10:54:34 -0000       1.4
+++ server/parser/sound_definition.h    30 Oct 2007 08:56:09 -0000      1.5
@@ -80,15 +80,10 @@
        void read(stream* in, int tag_type,
                movie_definition* m, const sound_sample* sam);
 
-       /// StartSound is a "state" tag.
-       void    execute_state(sprite_instance* m) const;
+       void    execute(sprite_instance* m) const;
 
-       /// This implementation of 'execute' should likely
-       /// be the default one.
-       void execute(sprite_instance* m) const
-       {
-               execute_state(m);
-       }
+       /// StartStreamSound is not a "state" tag?
+       void execute_state(sprite_instance* m) const { /*no-op*/ }
 
        /// TODO: provide execute_reverse ?
        /// (for StartSound would StopSound and vice-versa)
@@ -121,13 +116,10 @@
        /// Insert ourself into the movie.
        void    read(movie_definition* m, int handler_id, long start);
 
-       /// StartStreamSound is a "state" tag.
-       void    execute_state(sprite_instance* m) const;
+       void    execute(sprite_instance* m) const;
 
-       void execute(sprite_instance* m) const
-       {
-               execute_state(m);
-       }
+       /// StartStreamSound is not a "state" tag?
+       void execute_state(sprite_instance* m) const { /*no-op*/ }
 };
 
 } // namespace gnash