From 5f06c8bc10d6c3e67ff85699ec9692e230e05059 Mon Sep 17 00:00:00 2001 From: David PIROTTE Date: Fri, 10 Oct 2014 17:10:40 -0300 Subject: [PATCH 12/12] clutter_image_set_data special wrapper, plus some deprecated fixes * clutter/gnome/gw/clutter-support.c: * clutter/gnome/gw/clutter-support.h: _wrap_clutter_image_set_data added. * clutter/gnome/overrides/clutter.defs: (1) clutter_image_set_data overriden by calling _wrap_clutter_image_set_data. (2) some more deprecated procedures added, (3) clutter_box_layout_get_orientation, clutter_box_layout_set_orientation were mistakenly deprecated [my mistake], fixed. --- clutter/gnome/gw/clutter-support.c | 14 ++++++++++ clutter/gnome/gw/clutter-support.h | 4 +++ clutter/gnome/overrides/clutter.defs | 50 +++++++++++++++++++++--------------- 3 files changed, 48 insertions(+), 20 deletions(-) diff --git a/clutter/gnome/gw/clutter-support.c b/clutter/gnome/gw/clutter-support.c index f3bad6a..2088a95 100644 --- a/clutter/gnome/gw/clutter-support.c +++ b/clutter/gnome/gw/clutter-support.c @@ -406,3 +406,17 @@ scm_scm_to_clutter_matrix (SCM scm) return g_boxed_copy (clutter_matrix_get_type (), &ret); } + +gboolean +_wrap_clutter_image_set_data (ClutterImage *image, + guchar *data, + CoglPixelFormat pixel_format, + guint width, + guint height, + guint row_stride, + GError **error) +{ + return clutter_image_set_data (image, + (const guint8 *)data, + pixel_format, width, height, row_stride, error); +} diff --git a/clutter/gnome/gw/clutter-support.h b/clutter/gnome/gw/clutter-support.h index d5ead14..553ef91 100644 --- a/clutter/gnome/gw/clutter-support.h +++ b/clutter/gnome/gw/clutter-support.h @@ -73,3 +73,7 @@ ClutterRect* scm_scm_to_clutter_rect (SCM scm); SCM scm_clutter_matrix_to_scm (ClutterMatrix *m); ClutterMatrix* scm_scm_to_clutter_matrix (SCM scm); + +gboolean _wrap_clutter_image_set_data (ClutterImage *image, guchar *data, + CoglPixelFormat pixel_format, guint width, guint height, + guint row_stride, GError **error); diff --git a/clutter/gnome/overrides/clutter.defs b/clutter/gnome/overrides/clutter.defs index 110c4a9..ca86d6c 100644 --- a/clutter/gnome/overrides/clutter.defs +++ b/clutter/gnome/overrides/clutter.defs @@ -61,12 +61,6 @@ (gtype-id "CLUTTER_TYPE_CONTAINER") ) -(define-interface Media - (in-module "Clutter") - (c-name "ClutterMedia") - (gtype-id "CLUTTER_TYPE_MEDIA") -) - (define-interface StageManager (in-module "Clutter") (c-name "ClutterStageManager") @@ -202,6 +196,19 @@ (return-type "const-GSList*-of-ClutterInputDevice*") ) +(define-method set_data + (of-object "ClutterImage") + (c-name "_wrap_clutter_image_set_data") + (overrides "clutter_image_set_data") + (return-type "gboolean") + (parameters + '("guchar*" "data") + '("CoglPixelFormat" "pixel_format") + '("guint" "width") + '("guint" "height") + '("guint" "row_stride") + '("GError**" "error"))) + (define-method get_slave_devices (of-object "ClutterInputDevice") (c-name "clutter_input_device_get_slave_devices") @@ -226,7 +233,7 @@ (define-method get_nodes (of-object "ClutterPath") (c-name "clutter_path_get_nodes") - (overrides "clutter_path_get_nodes") + (overrides "clutter_path_get_nodes") (return-type "GSList*-of-ClutterPathNode*") ) @@ -364,20 +371,21 @@ "clutter_deform_effect_set_back_material" "clutter_event_get_axes" "clutter_frame_source_*" - "clutter_image_get_data" - "clutter_image_set_data" + ;; "clutter_image_set_data" this 1 must be wrapped [>= 1.12] "clutter_image_set_area" + "clutter_image_set_bytes" "clutter_image_get_texture" "clutter_init*" "clutter_interval_peek_*" "clutter_interval_compute_value" "clutter_get_option_group" "clutter_get_option_group_without_init" - ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main? + ;;"clutter_main*" ;; fixme: do i need to do something special with clutter-main? "clutter_threads*" "clutter_model*" "clutter_layout_manager_list_child_properties" "clutter_list_model*" + "clutter_matrix_init_from_array" ;; needs a special wrapper "clutter_offscreen_effect_get_target" "clutter_offscreen_effect_get_texture" "clutter_offscreen_effect_create_texture" @@ -508,6 +516,7 @@ "clutter_score_start" "clutter_score_stop" "clutter_shader_compile" + "clutter_shader_error_quark" "clutter_shader_get_fragment_source" "clutter_shader_get_is_enabled" "clutter_shader_get_vertex_source" @@ -670,22 +679,23 @@ "clutter_bin_layout_add" "clutter_bin_layout_get_alignment" "clutter_bin_layout_set_alignment" + + "clutter_box_layout_pack" + "clutter_box_layout_set_vertical" + "clutter_box_layout_get_vertical" + "clutter_box_layout_set_alignment" "clutter_box_layout_get_alignment" - "clutter_box_layout_get_easing_duration" - "clutter_box_layout_get_easing_mode" + "clutter_box_layout_set_expand" "clutter_box_layout_get_expand" + "clutter_box_layout_set_fill" "clutter_box_layout_get_fill" - "clutter_box_layout_get_orientation" + "clutter_box_layout_set_use_animations" "clutter_box_layout_get_use_animations" - "clutter_box_layout_get_vertical" - "clutter_box_layout_set_alignment" "clutter_box_layout_set_easing_duration" + "clutter_box_layout_get_easing_duration" "clutter_box_layout_set_easing_mode" - "clutter_box_layout_set_expand" - "clutter_box_layout_set_fill" - "clutter_box_layout_set_orientation" - "clutter_box_layout_set_use_animations" - "clutter_box_layout_set_vertical" + "clutter_box_layout_get_easing_mode" + "clutter_cairo_texture_clear" "clutter_cairo_texture_get_auto_resize" "clutter_cairo_texture_get_surface_size" -- 2.1.1