[prev in list] [next in list] [prev in thread] [next in thread]
List: gnash-commit
Subject: [Gnash-commit] /srv/bzr/gnash/trunk r11454: migrate to new GUI API
From: Markus Gothe <nietzsche () lysator ! liu ! se>
Date: 2009-08-30 0:45:24
Message-ID: E1MjcRl-00010n-2z () sv ! gnu ! org
[Download RAW message or body]
------------------------------------------------------------
revno: 11454
committer: Markus Gothe <nietzsche@lysator.liu.se>
branch nick: trunk
timestamp: Sun 2009-08-30 02:45:24 +0200
message:
migrate to new GUI API
modified:
gui/fltk_glue_cairo.cpp
gui/riscos.cpp
["r11454.diff" (r11454.diff)]
=== modified file 'gui/fltk_glue_cairo.cpp'
--- a/gui/fltk_glue_cairo.cpp 2009-08-05 16:19:21 +0000
+++ b/gui/fltk_glue_cairo.cpp 2009-08-30 00:45:24 +0000
@@ -43,7 +43,7 @@
#include "log.h"
#include "gui.h"
-//#include "Renderer.h"
+#include "RunResources.h"
using namespace std;
//using namespace fltk;
@@ -91,16 +91,25 @@
// CAIRO_FORMAT_RGB24 actualy means a 32-bit RGB word with the upper 8 bits
// unused. Therefore we have allocated a 32-bit buffer.
+ if (_cairo_surface)
+ cairo_surface_destroy(_cairo_surface);
+ if (_cairo_handle)
+ cairo_destroy(_cairo_handle);
+
_cairo_surface =
cairo_image_surface_create_for_data (_offscreenbuf, CAIRO_FORMAT_RGB24,
width, height, _stride);
_cairo_handle = cairo_create(_cairo_surface);
- renderer::cairo::set_handle(_cairo_handle);
+ cairo_set_source_surface(_cairo_handle, cairo_get_target(_cairo_handle), 0, 0);
+ renderer::cairo::set_context(_renderer, _cairo_handle);
+
+ //renderer::cairo::set_handle(_cairo_handle);
if (firstTime) {
- set_Renderer(_renderer);
+ //set_Renderer(_renderer);
+ _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
firstTime = false;
}
=== modified file 'gui/riscos.cpp'
--- a/gui/riscos.cpp 2009-07-13 09:15:53 +0000
+++ b/gui/riscos.cpp 2009-08-30 00:45:24 +0000
@@ -28,6 +28,8 @@
#include "Renderer.h"
#include "log.h"
+#include "RunResources.h"
+
//#include <iostream>
namespace gnash
@@ -106,8 +108,9 @@
glue.prepFramebuffer((void *)vduvals[0], _screen_width, _screen_height);
#endif
- _renderer = glue.createRenderHandler();
- set_Renderer(_renderer);
+ _renderer.reset(glue.createRenderHandler());
+ //set_Renderer(_renderer);
+ _runResources.setRenderer(boost::shared_ptr<Renderer>(_renderer));
// hack?
_renderer->set_scale(1.0f, 1.0f);
_______________________________________________
Gnash-commit mailing list
Gnash-commit@gnu.org
http://lists.gnu.org/mailman/listinfo/gnash-commit
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic