[Gnash-commit] /srv/bzr/gnash/trunk r11301: Changes to AmigaOS4 gui files to respect latest updates

[Andrea Palmatè]

------------------------------------------------------------
revno: 11301
committer: Andrea Palmatè <address@hidden>
branch nick: gnash
timestamp: Wed 2009-07-22 19:27:06 +0200
message:
  Changes to AmigaOS4 gui files to respect latest updates
modified:
  gui/aos4.cpp
  gui/aos4_agg_glue.h
  gui/aos4_cairo_glue.h
  gui/aos4_glue.h
  gui/aos4sup.h

=== modified file 'gui/aos4.cpp'
--- a/gui/aos4.cpp      2009-07-13 09:15:53 +0000
+++ b/gui/aos4.cpp      2009-07-22 17:27:06 +0000
@@ -36,6 +36,8 @@
 #include "log.h"
 #include "aos4sup.h"
 #include "aos4_gnash_prefs.h"
+#undef CUSTOM
+#include "RunResources.h"
 
 #include <getopt.h>
 #include <signal.h>
@@ -588,6 +590,7 @@
 bool
 AOS4Gui::init(int argc, char **argv[])
 {
+       int _depth = 24;
        struct ExecBase *sysbase = (struct ExecBase*) IExec->Data.LibBase;
 
        struct Library *timer = (struct Library 
*)IExec->FindName(&sysbase->DeviceList, "timer.device");
@@ -598,7 +601,8 @@
 
     _glue.init(argc, argv);
 
-    _renderer = _glue.createRenderHandler(_depth);
+    _renderer.reset(_glue.createRenderHandler(_depth));
+    //_renderer = _glue.createRenderHandler(_depth);
     if ( ! _renderer )
        {
                log_error (_("error creating RenderHandler!\n"));
@@ -622,7 +626,8 @@
 
     _glue.prepDrawingArea(_width, _height);
 
-    set_Renderer(_renderer);
+    //set_Renderer(_renderer);
+       _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
 
        struct Window *_window = _glue.getWindow();
 

=== modified file 'gui/aos4_agg_glue.h'
--- a/gui/aos4_agg_glue.h       2009-07-10 15:44:55 +0000
+++ b/gui/aos4_agg_glue.h       2009-07-22 17:27:06 +0000
@@ -41,8 +41,8 @@
            virtual ~AOS4AggGlue();
 
        bool                     init(int argc, char **argv[]);
-           Renderer    *createRenderHandler(int depth);
-       Renderer        *createRenderHandler();
+           Renderer            *createRenderHandler(int depth);
+       Renderer                *createRenderHandler();
            bool                         prepDrawingArea(int width, int height);
            void                         render();
        void                     render(int minx, int miny, int maxx, int maxy);
@@ -57,7 +57,7 @@
        geometry::Range2d<int> _validbounds;
            std::vector< geometry::Range2d<int> > _drawbounds;
        unsigned char           *_offscreenbuf;
-           Renderer    *_agg_renderer;
+           Renderer                    *_agg_renderer;
        struct Window           *_window;
        struct Screen           *_screen;
                bool                             _fullscreen;

=== modified file 'gui/aos4_cairo_glue.h'
--- a/gui/aos4_cairo_glue.h     2009-07-10 15:44:55 +0000
+++ b/gui/aos4_cairo_glue.h     2009-07-22 17:27:06 +0000
@@ -43,8 +43,8 @@
            virtual ~AOS4CairoGlue();
 
        bool                             init(int argc, char **argv[]);
-           Renderer            *createRenderHandler(int depth);
-       Renderer                *createRenderHandler();
+           Renderer                    *createRenderHandler(int depth);
+       Renderer                        *createRenderHandler();
            bool                                 prepDrawingArea(int width, int 
height);
            void                                 render();
        void                             render(int minx, int miny, int maxx, 
int maxy);
@@ -61,7 +61,7 @@
                cairo_surface_t         *_cairo_surface;
                cairo_t                 *_cairo_handle;
        unsigned char           *_offscreenbuf;
-           Renderer    *_cairo_renderer;
+           Renderer                    *_cairo_renderer;
        struct Window           *_window;
        struct Screen           *_screen;
                bool                             _fullscreen;

=== modified file 'gui/aos4_glue.h'
--- a/gui/aos4_glue.h   2009-07-10 15:44:55 +0000
+++ b/gui/aos4_glue.h   2009-07-22 17:27:06 +0000
@@ -21,6 +21,8 @@
 
 #include <boost/cstdint.hpp> // for boost::?int??_t 
 
+#include "Renderer.h"
+
 namespace gnash
 {
 

=== modified file 'gui/aos4sup.h'
--- a/gui/aos4sup.h     2009-07-13 09:15:53 +0000
+++ b/gui/aos4sup.h     2009-07-22 17:27:06 +0000
@@ -45,6 +45,7 @@
 #endif
 
 #undef End
+#undef ACTION_END
 #include "gui.h"
 
 #ifdef RENDERER_AGG
@@ -57,7 +58,6 @@
 
 #define End TAG_END
 
-#undef ACTION_END
 #include "Renderer.h"
 #include "Renderer_agg.h"