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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/28 01:00:04

Modified files:
        .              : ChangeLog 
        server         : Makefile.am impl.cpp character_def.h 
Added files:
        server         : character_def.cpp 

Log message:
        * server/Makefile.am, server/character_def.cpp, server/impl.cpp: Put 
character_def implementation in its own file.
        * server/character_def.h: Added missing forward declarations.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.434&r2=1.435
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/server/impl.cpp?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character_def.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character_def.cpp?cvsroot=gnash&rev=1.1

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- ChangeLog   27 Jun 2006 18:45:26 -0000      1.434
+++ ChangeLog   28 Jun 2006 01:00:04 -0000      1.435
@@ -1,3 +1,9 @@
+2006-06-28 Sandro Santilli <address@hidden>
+
+       * server/Makefile.am, server/character_def.cpp, server/impl.cpp:
+       Put character_def implementation in its own file.
+       * server/character_def.h: Added missing forward declarations.
+
 2006-06-27 Sandro Santilli <address@hidden>
 
        * server/swf/ASHandlers.cpp, server/ActionExec.cpp: moved

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- server/Makefile.am  25 Jun 2006 16:53:04 -0000      1.49
+++ server/Makefile.am  28 Jun 2006 01:00:04 -0000      1.50
@@ -125,6 +125,7 @@
        as_value.cpp     \
        as_environment.cpp       \
        character.cpp \
+       character_def.cpp \
         textformat.cpp \
         timers.cpp \
         xml.cpp \

Index: server/impl.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/impl.cpp,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- server/impl.cpp     8 Jun 2006 20:35:06 -0000       1.43
+++ server/impl.cpp     28 Jun 2006 01:00:04 -0000      1.44
@@ -124,13 +124,6 @@
        assert(loader_registered);
 }
 
-character*     character_def::create_character_instance(movie* parent, int id)
-    // Default.  Make a generic_character.
-{
-    return new generic_character(this, parent, id);
-}
-
-
 //
 // ref_counted
 //

Index: server/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/character_def.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/character_def.h      24 Jun 2006 17:56:36 -0000      1.3
+++ server/character_def.h      28 Jun 2006 01:00:04 -0000      1.4
@@ -44,6 +44,13 @@
 
 #include "resource.h" // for inheritance from resource class
 
+// Forward declarations
+class tu_file;
+namespace gnash {
+       class character;
+       class cache_options;
+};
+
 namespace gnash {
 
 /// Immutable data representing the template of a movie element.

Index: server/character_def.cpp
===================================================================
RCS file: server/character_def.cpp
diff -N server/character_def.cpp
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ server/character_def.cpp    28 Jun 2006 01:00:04 -0000      1.1
@@ -0,0 +1,60 @@
+// 
+//   Copyright (C) 2005, 2006 Free Software Foundation, Inc.
+// 
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+// Linking Gnash statically or dynamically with other modules is making a
+// combined work based on Gnash. Thus, the terms and conditions of the GNU
+// General Public License cover the whole combination.
+//
+// As a special exception, the copyright holders of Gnash give you
+// permission to combine Gnash with free software programs or libraries
+// that are released under the GNU LGPL and with code included in any
+// release of Talkback distributed by the Mozilla Foundation. You may
+// copy and distribute such a system following the terms of the GNU GPL
+// for all but the LGPL-covered parts and Talkback, and following the
+// LGPL for the LGPL-covered parts.
+//
+// Note that people who make modified versions of Gnash are not obligated
+// to grant this special exception for their modified versions; it is their
+// choice whether to do so. The GNU General Public License gives permission
+// to release a modified version without this exception; this exception
+// also makes it possible to release a modified version which carries
+// forward this exception.
+// 
+//
+//
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <character_def.h>
+#include <generic_character.h>
+
+namespace gnash
+{
+
+character*
+character_def::create_character_instance(movie* parent, int id)
+{
+       return new generic_character(this, parent, id);
+}
+
+}
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End: