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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/01/09 23:18:59

Modified files:
        .              : ChangeLog 
        server         : Makefile.am gnash.h 
        server/parser  : bitmap_character_def.h movie_definition.h 
Added files:
        server         : bitmap_info.h 

Log message:
                * server/Makefile.am, server/bitmap_info.h, server/gnash.h,
                  server/parser/bitmap_character_def.h,
                  server/parser/movie_definition.h:
                  Put 'bitmap_info' clases in its own header.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2065&r2=1.2066
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.97&r2=1.98
http://cvs.savannah.gnu.org/viewcvs/gnash/server/gnash.h?cvsroot=gnash&r1=1.80&r2=1.81
http://cvs.savannah.gnu.org/viewcvs/gnash/server/bitmap_info.h?cvsroot=gnash&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/bitmap_character_def.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/movie_definition.h?cvsroot=gnash&r1=1.15&r2=1.16

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2065
retrieving revision 1.2066
diff -u -b -r1.2065 -r1.2066
--- ChangeLog   9 Jan 2007 15:17:27 -0000       1.2065
+++ ChangeLog   9 Jan 2007 23:18:58 -0000       1.2066
@@ -1,3 +1,10 @@
+2007-01-10 Sandro Santilli <address@hidden>
+
+       * server/Makefile.am, server/bitmap_info.h, server/gnash.h,
+         server/parser/bitmap_character_def.h,
+         server/parser/movie_definition.h:
+         Put 'bitmap_info' clases in its own header.
+
 2007-01-09  Rob Savoye  <address@hidden>
 
        * server/asobj/Global.cpp: Always add XML support. Include

Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -b -r1.97 -r1.98
--- server/Makefile.am  17 Dec 2006 20:24:57 -0000      1.97
+++ server/Makefile.am  9 Jan 2007 23:18:59 -0000       1.98
@@ -18,7 +18,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.97 2006/12/17 20:24:57 rsavoye Exp $
+# $Id: Makefile.am,v 1.98 2007/01/09 23:18:59 strk Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -99,6 +99,7 @@
        as_object.h \
        as_prop_flags.h \
        as_value.h \
+       bitmap_info.h           \
        builtin_function.h      \
        button_character_instance.h \
        character.h \

Index: server/gnash.h
===================================================================
RCS file: /sources/gnash/gnash/server/gnash.h,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -b -r1.80 -r1.81
--- server/gnash.h      6 Dec 2006 10:58:34 -0000       1.80
+++ server/gnash.h      9 Jan 2007 23:18:59 -0000       1.81
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: gnash.h,v 1.80 2006/12/06 10:58:34 strk Exp $ */
+/* $Id: gnash.h,v 1.81 2007/01/09 23:18:59 strk Exp $ */
 
 /// \mainpage
 ///
@@ -37,8 +37,6 @@
 #include <cstdarg>     // for va_list arg to 
sprite_instance::call_method_args()
 #include <string>      // for movie_definition* create_movie(tu_file* in, 
const std::string& url);
 
-#include "ref_counted.h" // for bitmap_info inheritance
-
 #include "as_value.h" // FIXME: for as_c_function_ptr typedef 
(register_component)
 
 // FIXME: The local usage of these constants should probably be renamed in this
@@ -65,8 +63,6 @@
 // Forward declarations.
 class action_buffer;
 class as_value;
-class bitmap_info;
-class character;
 class execute_tag;
 class font;
 class matrix;
@@ -158,8 +154,6 @@
 DSOEXPORT sound_handler* create_sound_handler_gst();
 
 class font;
-class character_def;
-class sound_sample;
 
 /// For caching precomputed stuff.  Generally of
 /// interest to gnash_processor and programs like it.
@@ -608,30 +602,6 @@
 // texture and render callback handler.
 //
 
-/// Your render_handler creates bitmap_info's for gnash.  You
-/// need to subclass bitmap_info in order to add the
-/// information and functionality your app needs to render
-/// using textures.
-class DSOEXPORT bitmap_info : public ref_counted
-{
-public:
-       virtual void layout_image(image::image_base* /*im*/) { };
-       image::image_base*  m_suspended_image;
-
-       unsigned int    m_texture_id;           // nuke?
-       int             m_original_width;       // nuke?
-       int             m_original_height;      // nuke?
-               
-       bitmap_info()
-               :
-               m_suspended_image(NULL),
-               m_texture_id(0),
-               m_original_width(0),
-               m_original_height(0)
-               {
-               }
-};
-       
 /// Keyboard handling
 namespace key {
 enum code

Index: server/parser/bitmap_character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/bitmap_character_def.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/parser/bitmap_character_def.h        23 Nov 2006 19:28:36 -0000      
1.13
+++ server/parser/bitmap_character_def.h        9 Jan 2007 23:18:59 -0000       
1.14
@@ -31,6 +31,7 @@
 #include "container.h"
 #include "utility.h"
 #include "smart_ptr.h"
+#include "bitmap_info.h" // for dtor visibility by intrusive_ptr
 
 #include <cstdarg>
 #include <cassert>
@@ -77,13 +78,13 @@
        ///
        bitmap_character_def(std::auto_ptr<image::rgba> image);
 
-       gnash::bitmap_info* get_bitmap_info() {
+       bitmap_info* get_bitmap_info() {
                return _bitmap_info.get();
        }
 
 private:
 
-       boost::intrusive_ptr<gnash::bitmap_info> _bitmap_info;
+       boost::intrusive_ptr<bitmap_info> _bitmap_info;
 };
 
 

Index: server/parser/movie_definition.h
===================================================================
RCS file: /sources/gnash/gnash/server/parser/movie_definition.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- server/parser/movie_definition.h    6 Dec 2006 10:21:32 -0000       1.15
+++ server/parser/movie_definition.h    9 Jan 2007 23:18:59 -0000       1.16
@@ -61,6 +61,7 @@
 // Forward declarations
 namespace gnash {
        class bitmap_character_def;
+       class bitmap_info;
        class movie_instance;
        class sprite_instance;
 }

Index: server/bitmap_info.h
===================================================================
RCS file: server/bitmap_info.h
diff -N server/bitmap_info.h
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ server/bitmap_info.h        9 Jan 2007 23:18:59 -0000       1.1
@@ -0,0 +1,71 @@
+// 
+//   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
+
+
+/* $Id: bitmap_info.h,v 1.1 2007/01/09 23:18:59 strk Exp $ */
+
+#ifndef GNASH_BITMAP_INFO_H
+#define GNASH_BITMAP_INFO_H
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "ref_counted.h" // for inheritance
+#include "tu_config.h"
+
+// Forward declarations
+namespace image {
+       class image_base;
+}
+
+
+namespace gnash {
+
+/// Your render_handler creates bitmap_info's for gnash.  You
+/// need to subclass bitmap_info in order to add the
+/// information and functionality your app needs to render
+/// using textures.
+class DSOEXPORT bitmap_info : public ref_counted
+{
+public:
+       virtual void layout_image(image::image_base* /*im*/) { };
+       image::image_base*  m_suspended_image;
+
+       unsigned int    m_texture_id;           // nuke?
+       int             m_original_width;       // nuke?
+       int             m_original_height;      // nuke?
+               
+       bitmap_info()
+               :
+               m_suspended_image(NULL),
+               m_texture_id(0),
+               m_original_width(0),
+               m_original_height(0)
+               {
+               }
+};
+       
+
+}      // namespace gnash
+
+#endif // GNASH_BITMAP_INFO_H
+
+
+// Local Variables:
+// mode: C++
+// indent-tabs-mode: t
+// End: