[Gnash-commit] gnash ChangeLog server/Makefile.am server/impl....

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/11/23 13:25:05

Modified files:
        .              : ChangeLog 
        server         : Makefile.am impl.cpp 
        server/swf     : tag_loaders.cpp tag_loaders.h 

Log message:
        Extrapolated a SetBackgroundColorTag class out of tag_loaders.cpp
        into its own header file, cleaned up.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.4937&r2=1.4938
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.130&r2=1.131
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.123&r2=1.124
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.150&r2=1.151
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.h?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.4937
retrieving revision 1.4938
diff -u -b -r1.4937 -r1.4938
--- ChangeLog   23 Nov 2007 12:53:26 -0000      1.4937
+++ ChangeLog   23 Nov 2007 13:25:04 -0000      1.4938
@@ -1,3 +1,9 @@
+2007-11-23 Sandro Santilli <address@hidden>
+
+       * server/: Makefile.am, impl.cpp, swf/tag_loaders.{cpp,h}:
+         Extrapolated a SetBackgroundColorTag class out of tag_loaders.cpp
+         into its own header file, cleaned up.
+
 2007-11-23 Benjamin Wolsey <address@hidden>
 
        * testsuite/actionscript.all/NetStream.as: add missing tests for

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.130
retrieving revision 1.131
diff -u -b -r1.130 -r1.131
--- server/Makefile.am  23 Nov 2007 12:21:26 -0000      1.130
+++ server/Makefile.am  23 Nov 2007 13:25:05 -0000      1.131
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.130 2007/11/23 12:21:26 strk Exp $
+# $Id: Makefile.am,v 1.131 2007/11/23 13:25:05 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -180,6 +180,7 @@
        swf/DisplayListTag.h \
        swf/DoActionTag.h \
        swf/DoInitActionTag.h \
+       swf/SetBackgroundColorTag.h \
        swf_event.h \
        swf_function.h \
        tesselate.h \

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- server/impl.cpp     23 Nov 2007 12:21:26 -0000      1.123
+++ server/impl.cpp     23 Nov 2007 13:25:05 -0000      1.124
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: impl.cpp,v 1.123 2007/11/23 12:21:26 strk Exp $ */
+/* $Id: impl.cpp,v 1.124 2007/11/23 13:25:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -41,7 +41,6 @@
 #include "movie_def_impl.h"
 #include "swf.h"
 #include "swf/TagLoadersTable.h"
-#include "swf/tag_loaders.h"
 #include "generic_character.h"
 #include "URL.h"
 #include "StreamProvider.h"
@@ -53,6 +52,8 @@
 #include "RemoveObjectTag.h"
 #include "DoActionTag.h"
 #include "DoInitActionTag.h"
+#include "SetBackgroundColorTag.h"
+#include "swf/tag_loaders.h" // for all tag loaders..
 #include "sound_handler.h" // for get_sound_handler
 #ifdef GNASH_USE_GC
 #include "GC.h"
@@ -164,7 +165,10 @@
        // Register the standard loaders.
        s_registered = true;
 
+       // End tag doesn't really need to exist.
+       // TODO: use null_loader here ?
        register_tag_loader(SWF::END,           end_loader);
+
        register_tag_loader(SWF::DEFINESHAPE,   define_shape_loader);
        register_tag_loader(SWF::FREECHARACTER, fixme_loader); // 03
        register_tag_loader(SWF::PLACEOBJECT,   PlaceObject2Tag::loader);
@@ -172,7 +176,7 @@
        register_tag_loader(SWF::DEFINEBITS,    define_bits_jpeg_loader);
        register_tag_loader(SWF::DEFINEBUTTON,  button_character_loader);
        register_tag_loader(SWF::JPEGTABLES,    jpeg_tables_loader);
-       register_tag_loader(SWF::SETBACKGROUNDCOLOR, 
set_background_color_loader);
+       register_tag_loader(SWF::SETBACKGROUNDCOLOR, 
SetBackgroundColorTag::loader);
        register_tag_loader(SWF::DEFINEFONT,    define_font_loader);
        register_tag_loader(SWF::DEFINETEXT,    define_text_loader);
        register_tag_loader(SWF::DOACTION,      DoActionTag::doActionLoader);

Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.150
retrieving revision 1.151
diff -u -b -r1.150 -r1.151
--- server/swf/tag_loaders.cpp  23 Nov 2007 12:21:27 -0000      1.150
+++ server/swf/tag_loaders.cpp  23 Nov 2007 13:25:05 -0000      1.151
@@ -17,7 +17,7 @@
 // Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 //
 
-/* $Id: tag_loaders.cpp,v 1.150 2007/11/23 12:21:27 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.151 2007/11/23 13:25:05 strk Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -49,7 +49,6 @@
 #include "swf/TagLoadersTable.h"
 #include "text_character_def.h"
 #include "edit_text_character_def.h"
-#include "ControlTag.h" // for set_background_color inheritance 
 #include "URL.h"
 #include "GnashException.h"
 #include "video_stream_def.h"
@@ -187,55 +186,6 @@
     delete [] n;
 }
 
-/// SWF Tag SetBackgroundColor (9)
-//
-/// TODO: Move in it's own SetBackgroundColorTag files
-///
-class set_background_color : public ControlTag
-{
-private:
-    rgba       m_color;
-
-public:
-    void       execute(sprite_instance* m) const
-       {
-           float       current_alpha = m->get_background_alpha();
-           rgba newcolor = m_color; // to avoid making m_color mutable
-           newcolor.m_a = frnd(current_alpha * 255.0f);
-           m->set_background_color(newcolor);
-       }
-
-    void       execute_state(sprite_instance* m) const
-       {
-           execute(m);
-       }
-
-    void       read(stream* in)
-       {
-           m_color.read_rgb(in);
-
-           IF_VERBOSE_PARSE
-           (
-               log_parse(_("  set_background_color: (%d %d %d)"),
-                         m_color.m_r, m_color.m_g, m_color.m_b);
-           );
-       }
-};
-
-
-// SWF Tag SetBackgroundColor (9)
-void
-set_background_color_loader(stream* in, tag_type tag, movie_definition* m)
-{
-    assert(tag == SWF::SETBACKGROUNDCOLOR); // 9
-    assert(m);
-
-    set_background_color* t = new set_background_color;
-    t->read(in);
-
-    m->addControlTag(t);
-}
-
 // Load JPEG compression tables that can be used to load
 // images further along in the stream.
 void
@@ -899,12 +849,6 @@
 
 // end_tag doesn't actually need to exist.
 
-void   end_loader(stream* in, tag_type tag, movie_definition* /*m*/)
-{
-    assert(tag == SWF::END); // 0
-    assert(in->get_position() == in->get_tag_end_position());
-}
-
 void   button_sound_loader(stream* in, tag_type tag, movie_definition* m)
 {
     assert(tag == SWF::DEFINEBUTTONSOUND); // 17

Index: server/swf/tag_loaders.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/swf/tag_loaders.h    21 Sep 2007 13:40:32 -0000      1.22
+++ server/swf/tag_loaders.h    23 Nov 2007 13:25:05 -0000      1.23
@@ -19,7 +19,7 @@
 //
 //
 
-/* $Id: tag_loaders.h,v 1.22 2007/09/21 13:40:32 cmusick Exp $ */
+/* $Id: tag_loaders.h,v 1.23 2007/11/23 13:25:05 strk Exp $ */
 
 #ifndef GNASH_SWF_TAG_LOADERS_H
 #define GNASH_SWF_TAG_LOADERS_H
@@ -30,6 +30,8 @@
 
 #include "swf.h" // for SWF::tag_type
 
+#include <cassert>
+
 // Forward declarations
 namespace gnash {
        class movie_definition;
@@ -47,9 +49,6 @@
 /// This is like null_loader except it prints a message to nag us to fix it.
 void   fixme_loader(stream*, tag_type, movie_definition*);
 
-/// Set background color (SWF::SETBACKGROUNDCOLOR)
-void   set_background_color_loader(stream*, tag_type, movie_definition*);
-
 /// \brief
 /// Load JPEG compression tables that can be used to load
 /// images further along in the stream. (SWF::JPEGTABLES)
@@ -110,7 +109,13 @@
 ///
 void   sprite_loader(stream*, tag_type, movie_definition*);
 
-void   end_loader(stream*, tag_type, movie_definition*);
+// end_tag doesn't actually need to exist.
+// TODO: drop this loader ?
+void   end_loader(stream* in, tag_type tag, movie_definition*)
+{
+       assert(tag == SWF::END); // 0
+       assert(in->get_position() == in->get_tag_end_position());
+}
 
 void   remove_object_2_loader(stream*, tag_type, movie_definition*);