[Gnash-commit] /srv/bzr/gnash/trunk r10810: Add libcode/swf to compiler include flags in pythonmodule so that 'make'

[Benjamin Wolsey]

------------------------------------------------------------
revno: 10810
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Mon 2009-04-20 19:20:47 +0200
message:
  Add libcode/swf to compiler include flags in pythonmodule so that 'make'
  works in that directory. Drop one unnecessary include from render.h,
  revealing that the rest of the includes are a bit of a mess.
  
  Correct these in various places.
  
  Move members used only in the agg handler or not at all out of the base
  class, or drop them completely.
modified:
  backend/render_handler.h
  backend/render_handler_agg.cpp
  libcore/RGBA.h
  libcore/render.cpp
  pythonmodule/Makefile.am
  pythonmodule/gnashpython.cpp
  pythonmodule/gnashpython.h

=== modified file 'backend/render_handler.h'
--- a/backend/render_handler.h  2009-04-07 14:32:06 +0000
+++ b/backend/render_handler.h  2009-04-20 17:20:47 +0000
@@ -146,9 +146,9 @@
 #include "dsodefs.h" // for DSOEXPORT
 
 #include "gnash.h" // Quality
-#include "DefineShapeTag.h"    
 #include "DisplayObject.h"
 #include "Range2d.h"
+#include "RGBA.h"
 
 // Forward declarations.
 namespace gnash {
@@ -157,12 +157,12 @@
     class rgba;
     class SWFMatrix;
     class cxform;
+    class fill_style;
+    class line_style;
 
     namespace SWF {
-        class DefineMorphShapeTag;
         class ShapeRecord;
     }
-    class DefineShapeTag;
 
     class Shape;
     class MorphShape;
@@ -559,28 +559,9 @@
 
 protected:
 
-    /// Cached fill style list with just one entry used for font rendering
-    std::vector<fill_style> m_single_fill_styles;
-
-    /// Dummy line styles list without entries (do not add anything!!)
-    std::vector<line_style> m_dummy_line_styles;
 
     /// Dummy, neutral color transformation (do not change!!)
-    cxform m_neutral_cxform;
-
-    /// Sets m_single_fill_styles to one solid fill with the given color 
-    void need_single_fill_style(const rgba& color)
-    {
-
-        if (m_single_fill_styles.size() == 0)
-        { 
-            fill_style dummy;
-            m_single_fill_styles.push_back(dummy);
-        }
-
-        m_single_fill_styles[0].set_color(color);
-
-    } 
+    const cxform m_neutral_cxform;
 
     /// Kept in parallel with movie_root's setting.
     Quality _quality;

=== modified file 'backend/render_handler_agg.cpp'
--- a/backend/render_handler_agg.cpp    2009-04-15 12:27:37 +0000
+++ b/backend/render_handler_agg.cpp    2009-04-20 17:20:47 +0000
@@ -2019,6 +2019,20 @@
   }  
   
 private:  // private variables
+    
+  /// Sets m_single_fill_styles to one solid fill with the given color 
+    void need_single_fill_style(const rgba& color)
+    {
+
+        if (m_single_fill_styles.size() == 0)
+        { 
+            fill_style dummy;
+            m_single_fill_styles.push_back(dummy);
+        }
+
+        m_single_fill_styles[0].set_color(color);
+
+    } 
 
     typedef agg::renderer_base<PixelFormat> renderer_base;
 
@@ -2048,6 +2062,11 @@
 
     // Alpha mask stack
     AlphaMasks _alphaMasks;
+    
+    /// Cached fill style list with just one entry used for font rendering
+    std::vector<fill_style> m_single_fill_styles;
+
+
 };
 
 

=== modified file 'libcore/RGBA.h'
--- a/libcore/RGBA.h    2009-03-10 08:50:13 +0000
+++ b/libcore/RGBA.h    2009-04-20 17:20:47 +0000
@@ -8,9 +8,10 @@
 #ifndef GNASH_TYPES_H
 #define GNASH_TYPES_H
 
+#include "swf.h"
+
 #include <string>
 #include <boost/cstdint.hpp> // for boost::?int??_t 
-#include "swf.h"
 
 namespace gnash {
        class SWFStream;        // forward declaration

=== modified file 'libcore/render.cpp'
--- a/libcore/render.cpp        2009-04-07 14:32:06 +0000
+++ b/libcore/render.cpp        2009-04-20 17:20:47 +0000
@@ -20,6 +20,7 @@
 
 #include "render.h"
 #include "GnashImage.h"
+#include "BitmapInfo.h"
 
 // Define this to have all renderer calls print a message (with -vv)
 #undef DEBUG_RENDER_CALLS 

=== modified file 'pythonmodule/Makefile.am'
--- a/pythonmodule/Makefile.am  2009-04-16 00:11:19 +0000
+++ b/pythonmodule/Makefile.am  2009-04-20 17:20:47 +0000
@@ -43,6 +43,7 @@
 
 libgnashpython_la_CPPFLAGS = \
         -I$(top_srcdir)/libcore \
+        -I$(top_srcdir)/libcore/swf \
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libltdl \
@@ -73,6 +74,7 @@
 gnash_la_CPPFLAGS = -I.. \
         -I$(top_srcdir) \
         -I$(top_srcdir)/libcore \
+        -I$(top_srcdir)/libcore/swf \
         -I$(top_srcdir)/libcore/parser \
         -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libltdl \

=== modified file 'pythonmodule/gnashpython.cpp'
--- a/pythonmodule/gnashpython.cpp      2009-04-15 05:33:51 +0000
+++ b/pythonmodule/gnashpython.cpp      2009-04-20 17:20:47 +0000
@@ -347,7 +347,7 @@
 GnashPlayer::getCurrentFrame() const
 {
     REQUIRE_VM_STARTED;
-    return _movieRoot->getRootMovie()->get_current_frame();
+    return _movieRoot->getRootMovie().get_current_frame();
 }
 
 //
@@ -447,19 +447,6 @@
     return chr;
 }
 
-GnashCharacter*
-GnashPlayer::getCharacterById(int id)
-{
-    REQUIRE_VM_STARTED;
-
-    gnash::DisplayObject* c = _movieRoot->getRootMovie()->getDisplayObject(id);
-    
-    if (!c) return NULL;
-    
-    GnashCharacter* chr(new GnashCharacter(c));
-
-    return chr;
-}
 
 GnashCharacter*
 GnashPlayer::getTopmostMouseEntity()

=== modified file 'pythonmodule/gnashpython.h'
--- a/pythonmodule/gnashpython.h        2009-04-15 05:33:51 +0000
+++ b/pythonmodule/gnashpython.h        2009-04-20 17:20:47 +0000
@@ -99,9 +99,6 @@
     
     // Display Objects
     GnashCharacter* getCharacterByTarget(const std::string& tgt);
-
-    // Sprites
-    GnashCharacter* getCharacterById(int id);    
     GnashCharacter* getTopmostMouseEntity();
 
     // Interaction