[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Defi...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Defi... |
|
Date: |
Wed, 23 May 2007 21:55:06 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 07/05/23 21:55:06
Modified files:
. : ChangeLog
server : impl.cpp
server/swf : DefineFontAlignZonesTag.cpp
DefineFontAlignZonesTag.h DisplayListTag.h
PlaceObject2Tag.cpp PlaceObject2Tag.h
RemoveObjectTag.cpp RemoveObjectTag.h
tag_loaders.cpp
Log message:
* server/swf/: tag_loaders.cpp, DefineFontAlignZonesTag.{cpp,h},
DisplayListTag.h, PlaceObject2Tag.{cpp,h},
RemoveObjectTag.{cpp,h}:
Move one namespace up (gnash::SWF - strip tag_loaders);
Provide a static public loader() function for use by
register_tag_loader (moved implementation from tag_loaders.cpp
to the classes themselves).
* server/impl.cpp: update loaders registration to call the new
public static methods of ReplaceObjectTag and PlaceObject2Tag.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3326&r2=1.3327
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.105&r2=1.106
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.cpp?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DefineFontAlignZonesTag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/DisplayListTag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/PlaceObject2Tag.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/RemoveObjectTag.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.107&r2=1.108
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3326
retrieving revision 1.3327
diff -u -b -r1.3326 -r1.3327
--- ChangeLog 23 May 2007 20:31:07 -0000 1.3326
+++ ChangeLog 23 May 2007 21:55:05 -0000 1.3327
@@ -1,5 +1,17 @@
2007-05-23 Sandro Santilli <address@hidden>
+ * server/swf/: tag_loaders.cpp, DefineFontAlignZonesTag.{cpp,h},
+ DisplayListTag.h, PlaceObject2Tag.{cpp,h},
+ RemoveObjectTag.{cpp,h}:
+ Move one namespace up (gnash::SWF - strip tag_loaders);
+ Provide a static public loader() function for use by
+ register_tag_loader (moved implementation from tag_loaders.cpp
+ to the classes themselves).
+ * server/impl.cpp: update loaders registration to call the new
+ public static methods of ReplaceObjectTag and PlaceObject2Tag.
+
+2007-05-23 Sandro Santilli <address@hidden>
+
* server/execute_tag.h: drop is_remove_tag() method.
* server/sprite_instance.{cpp,h}: drop unused
execute_remove_tags() method.
Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -b -r1.105 -r1.106
--- server/impl.cpp 2 May 2007 18:19:02 -0000 1.105
+++ server/impl.cpp 23 May 2007 21:55:05 -0000 1.106
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: impl.cpp,v 1.105 2007/05/02 18:19:02 martinwguy Exp $ */
+/* $Id: impl.cpp,v 1.106 2007/05/23 21:55:05 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -49,6 +49,8 @@
#include "VM.h"
#include "BitmapMovieDefinition.h"
#include "DefineFontAlignZonesTag.h"
+#include "PlaceObject2Tag.h"
+#include "RemoveObjectTag.h"
#include "sound_handler.h" // for get_sound_handler
#include <string>
@@ -134,6 +136,7 @@
static void ensure_loaders_registered()
{
using namespace SWF::tag_loaders;
+ using namespace SWF;
static bool s_registered = false;
@@ -145,8 +148,8 @@
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, place_object_2_loader);
- register_tag_loader(SWF::REMOVEOBJECT, remove_object_2_loader);
+ register_tag_loader(SWF::PLACEOBJECT, PlaceObject2Tag::loader);
+ register_tag_loader(SWF::REMOVEOBJECT, RemoveObjectTag::loader); // 05
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);
@@ -170,9 +173,9 @@
// (might be nice to dump the password instead..)
register_tag_loader(SWF::PROTECT, null_loader);
register_tag_loader(SWF::PATHSAREPOSTSCRIPT, fixme_loader); // 25
- register_tag_loader(SWF::PLACEOBJECT2, place_object_2_loader);
+ register_tag_loader(SWF::PLACEOBJECT2, PlaceObject2Tag::loader);
// 27 - _UNKNOWN_ unimplemented
- register_tag_loader(SWF::REMOVEOBJECT2, remove_object_2_loader);
+ register_tag_loader(SWF::REMOVEOBJECT2, RemoveObjectTag::loader); // 28
register_tag_loader(SWF::SYNCFRAME, fixme_loader); // 29
// 30 - _UNKNOWN_ unimplemented
register_tag_loader(SWF::FREEALL, fixme_loader); // 31
Index: server/swf/DefineFontAlignZonesTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/swf/DefineFontAlignZonesTag.cpp 18 Apr 2007 14:07:33 -0000
1.3
+++ server/swf/DefineFontAlignZonesTag.cpp 23 May 2007 21:55:05 -0000
1.4
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: DefineFontAlignZonesTag.cpp,v 1.3 2007/04/18 14:07:33 jgilmore Exp $ */
+/* $Id: DefineFontAlignZonesTag.cpp,v 1.4 2007/05/23 21:55:05 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -32,7 +32,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
DefineFontAlignZonesTag::DefineFontAlignZonesTag(movie_definition& /* m */,
stream& /* in */)
@@ -74,7 +73,6 @@
}
-} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/DefineFontAlignZonesTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DefineFontAlignZonesTag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/DefineFontAlignZonesTag.h 21 Feb 2007 13:22:37 -0000
1.1
+++ server/swf/DefineFontAlignZonesTag.h 23 May 2007 21:55:05 -0000
1.2
@@ -18,7 +18,7 @@
//
//
-/* $Id: DefineFontAlignZonesTag.h,v 1.1 2007/02/21 13:22:37 strk Exp $ */
+/* $Id: DefineFontAlignZonesTag.h,v 1.2 2007/05/23 21:55:05 strk Exp $ */
#ifndef GNASH_SWF_DEFINEFONTALIGNZONESTAG_H
#define GNASH_SWF_DEFINEFONTALIGNZONESTAG_H
@@ -35,7 +35,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
class DefineFontAlignZonesTag {
public:
@@ -58,7 +57,6 @@
};
-} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/DisplayListTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/DisplayListTag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/DisplayListTag.h 23 May 2007 20:06:20 -0000 1.1
+++ server/swf/DisplayListTag.h 23 May 2007 21:55:05 -0000 1.2
@@ -19,7 +19,7 @@
//
//
-/* $Id: DisplayListTag.h,v 1.1 2007/05/23 20:06:20 strk Exp $ */
+/* $Id: DisplayListTag.h,v 1.2 2007/05/23 21:55:05 strk Exp $ */
#ifndef GNASH_SWF_DISPLAYLISTTAG_H
#define GNASH_SWF_DISPLAYLISTTAG_H
@@ -44,7 +44,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
/// DisplayList tag
//
@@ -96,7 +95,6 @@
};
-} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/PlaceObject2Tag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/swf/PlaceObject2Tag.cpp 15 May 2007 13:48:37 -0000 1.10
+++ server/swf/PlaceObject2Tag.cpp 23 May 2007 21:55:05 -0000 1.11
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: PlaceObject2Tag.cpp,v 1.10 2007/05/15 13:48:37 strk Exp $ */
+/* $Id: PlaceObject2Tag.cpp,v 1.11 2007/05/23 21:55:05 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -32,7 +32,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
void
PlaceObject2Tag::readPlaceObject(stream* in)
@@ -364,7 +363,34 @@
}
}
-} // namespace gnash::SWF::tag_loaders
+/* public static */
+void
+PlaceObject2Tag::loader(stream* in, tag_type tag, movie_definition* m)
+{
+ assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2);
+
+ IF_VERBOSE_PARSE
+ (
+ log_parse(_(" place_object_2"));
+ );
+
+ // TODO: who owns and is going to remove this tag ?
+ PlaceObject2Tag* ch = new PlaceObject2Tag(*m);
+ ch->read(in, tag, m->get_version());
+
+ m->add_execute_tag(ch);
+
+ int depth = ch->getDepth();
+ if ( depth < 0 && depth >= character::staticDepthOffset )
+ {
+ m->addTimelineDepth(ch->getDepth());
+ }
+ else
+ {
+ log_debug("PlaceObject2Tag depth %d is out of static depth zone. Won't
register its TimelineDepth.", depth);
+ }
+}
+
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/PlaceObject2Tag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/PlaceObject2Tag.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/swf/PlaceObject2Tag.h 23 May 2007 20:06:20 -0000 1.6
+++ server/swf/PlaceObject2Tag.h 23 May 2007 21:55:05 -0000 1.7
@@ -18,7 +18,7 @@
//
//
-/* $Id: PlaceObject2Tag.h,v 1.6 2007/05/23 20:06:20 strk Exp $ */
+/* $Id: PlaceObject2Tag.h,v 1.7 2007/05/23 21:55:05 strk Exp $ */
#ifndef GNASH_SWF_PLACEOBJECT2TAG_H
#define GNASH_SWF_PLACEOBJECT2TAG_H
@@ -46,7 +46,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
/// SWF Tag PlaceObject (4) or PlaceObject2 (9)
//
@@ -97,6 +96,8 @@
/// Return true if this tag transforms a character
bool isMove() const { return m_place_type == MOVE; }
+ static void loader(stream* in, tag_type tag, movie_definition* m);
+
private:
int m_tag_type;
@@ -132,7 +133,6 @@
};
-} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/RemoveObjectTag.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/RemoveObjectTag.cpp 23 May 2007 20:06:20 -0000 1.1
+++ server/swf/RemoveObjectTag.cpp 23 May 2007 21:55:06 -0000 1.2
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: RemoveObjectTag.cpp,v 1.1 2007/05/23 20:06:20 strk Exp $ */
+/* $Id: RemoveObjectTag.cpp,v 1.2 2007/05/23 21:55:06 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -31,7 +31,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
void
RemoveObjectTag::read(stream* in, tag_type tag)
@@ -55,7 +54,26 @@
m->remove_display_object(m_depth, m_id);
}
-} // namespace gnash::SWF::tag_loaders
+/* public static */
+void
+RemoveObjectTag::loader(stream* in, tag_type tag, movie_definition* m)
+{
+ assert(tag == SWF::REMOVEOBJECT || tag == SWF::REMOVEOBJECT2);
+
+ std::auto_ptr<RemoveObjectTag> t ( new RemoveObjectTag );
+ t->read(in, tag);
+
+ IF_VERBOSE_PARSE
+ (
+ log_parse(_(" remove_object_2(%d)"), t->getDepth());
+ );
+
+ m->removeTimelineDepth(t->getDepth());
+
+ // Ownership transferred to movie_definition
+ m->add_execute_tag(t.release());
+}
+
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/RemoveObjectTag.h
===================================================================
RCS file: /sources/gnash/gnash/server/swf/RemoveObjectTag.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/swf/RemoveObjectTag.h 23 May 2007 20:06:20 -0000 1.1
+++ server/swf/RemoveObjectTag.h 23 May 2007 21:55:06 -0000 1.2
@@ -19,7 +19,7 @@
//
//
-/* $Id: RemoveObjectTag.h,v 1.1 2007/05/23 20:06:20 strk Exp $ */
+/* $Id: RemoveObjectTag.h,v 1.2 2007/05/23 21:55:06 strk Exp $ */
#ifndef GNASH_SWF_REMOVEOBJECTTAG_H
#define GNASH_SWF_REMOVEOBJECTTAG_H
@@ -41,7 +41,6 @@
namespace gnash {
namespace SWF {
-namespace tag_loaders {
/// SWF Tag RemoveObject (5) or RemoveObject2 (28)
//
@@ -68,13 +67,14 @@
// See dox in execute_tag.h
bool isRemove() const { return true; }
+ static void loader(stream* in, tag_type tag, movie_definition* m);
+
private:
int m_id;
};
-} // namespace gnash::SWF::tag_loaders
} // namespace gnash::SWF
} // namespace gnash
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/swf/tag_loaders.cpp 23 May 2007 20:06:20 -0000 1.107
+++ server/swf/tag_loaders.cpp 23 May 2007 21:55:06 -0000 1.108
@@ -17,7 +17,7 @@
// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
//
-/* $Id: tag_loaders.cpp,v 1.107 2007/05/23 20:06:20 strk Exp $ */
+/* $Id: tag_loaders.cpp,v 1.108 2007/05/23 21:55:06 strk Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -773,33 +773,6 @@
}
}
-void
-place_object_2_loader(stream* in, tag_type tag, movie_definition* m)
-{
- assert(tag == SWF::PLACEOBJECT || tag == SWF::PLACEOBJECT2);
-
- IF_VERBOSE_PARSE
- (
- log_parse(_(" place_object_2"));
- );
-
- // TODO: who owns and is going to remove this tag ?
- PlaceObject2Tag* ch = new PlaceObject2Tag(*m);
- ch->read(in, tag, m->get_version());
-
- m->add_execute_tag(ch);
-
- int depth = ch->getDepth();
- if ( depth < 0 && depth >= character::staticDepthOffset )
- {
- m->addTimelineDepth(ch->getDepth());
- }
- else
- {
- log_debug("PlaceObject2Tag depth %d is out of static depth zone. Won't
register its TimelineDepth.", depth);
- }
-}
-
// Create and initialize a sprite, and add it to the movie.
void
sprite_loader(stream* in, tag_type tag, movie_definition* m)
@@ -843,25 +816,6 @@
assert(in->get_position() == in->get_tag_end_position());
}
-void remove_object_2_loader(stream* in, tag_type tag, movie_definition* m)
-{
- assert(tag == SWF::REMOVEOBJECT || tag == SWF::REMOVEOBJECT2);
-
- std::auto_ptr<RemoveObjectTag> t ( new RemoveObjectTag );
- t->read(in, tag);
-
- IF_VERBOSE_PARSE
- (
- log_parse(_(" remove_object_2(%d)"), t->getDepth());
- );
-
- m->removeTimelineDepth(t->getDepth());
-
- // Ownership transferred to movie_definition
- m->add_execute_tag(t.release());
-}
-
-
void button_sound_loader(stream* in, tag_type tag, movie_definition* m)
{
assert(tag == SWF::DEFINEBUTTONSOUND); // 17
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog server/impl.cpp server/swf/Defi...,
Sandro Santilli <=