gnomemm r2101 - in cluttermm/trunk: clutter/src tools/extra_defs_gen tools/m4

From: siavashs svn gnome org
To: svn-commits-list gnome org
Subject: gnomemm r2101 - in cluttermm/trunk: clutter/src tools/extra_defs_gen tools/m4
Date: Sat, 14 Mar 2009 13:12:30 +0000 (UTC)
Author: siavashs
Date: Sat Mar 14 13:12:30 2009
New Revision: 2101
URL: http://svn.gnome.org/viewvc/gnomemm?rev=2101&view=rev

Log:
Updated to fix the build againt clutter trunk

  * clutter/src/clutter_methods.defs: Regenerated
  * clutter/src/actor.hg:
  * clutter/src/behaviour-ellipse.hg:
  * clutter/src/behaviour-rotate.hg:
  * clutter/src/behaviour-scale.hg
  * clutter/src/color.ccg:
  * clutter/src/color.hg:
  * clutter/src/media.hg:
  * clutter/src/stage.ccg:
  * clutter/src/stage.hg:
  * clutter/src/text.hg:
  * clutter/src/timeline.hg:
  * clutter/src/types.hg: Replaced Clutter::Fixed with Cogl Fixed,
  Removed Depricated methods, Updated changed methods
  * tools/extra_defs_gen/generate_defs_clutter.cc:
  * tools/m4/convert_cluttermm.m4: Removed Clutter:Fixed conversions
  * tools/m4/convert.m4:
  * tools/m4/Makefile_list_of_sources.am_fragment:
  * cluttermm/trunk/tools/m4/convert_coglmm.m4: Added Cogl::Fixed conversions

Added:
   cluttermm/trunk/tools/m4/convert_coglmm.m4
Modified:
   cluttermm/trunk/clutter/src/actor.hg
   cluttermm/trunk/clutter/src/behaviour-ellipse.hg
   cluttermm/trunk/clutter/src/behaviour-rotate.hg
   cluttermm/trunk/clutter/src/behaviour-scale.hg
   cluttermm/trunk/clutter/src/clutter_methods.defs
   cluttermm/trunk/clutter/src/color.ccg
   cluttermm/trunk/clutter/src/color.hg
   cluttermm/trunk/clutter/src/media.hg
   cluttermm/trunk/clutter/src/stage.ccg
   cluttermm/trunk/clutter/src/stage.hg
   cluttermm/trunk/clutter/src/text.hg
   cluttermm/trunk/clutter/src/timeline.hg
   cluttermm/trunk/clutter/src/types.hg
   cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
   cluttermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
   cluttermm/trunk/tools/m4/convert.m4
   cluttermm/trunk/tools/m4/convert_cluttermm.m4

Modified: cluttermm/trunk/clutter/src/actor.hg
==============================================================================
--- cluttermm/trunk/clutter/src/actor.hg	(original)
+++ cluttermm/trunk/clutter/src/actor.hg	Sat Mar 14 13:12:30 2009
@@ -128,10 +128,8 @@
   _WRAP_METHOD(bool get_reactive() const, clutter_actor_get_reactive)
 
   _WRAP_METHOD(void set_rotation(RotateAxis axis, double angle, int x, int y, int z), clutter_actor_set_rotation)
-  _WRAP_METHOD(void set_rotationx(RotateAxis axis, Fixed angle, int x, int y, int z), clutter_actor_set_rotationx)
   _WRAP_METHOD(void set_rotationu(RotateAxis axis, double angle, Unit x, Unit y, Unit z), clutter_actor_set_rotationu)
   _WRAP_METHOD(double get_rotation(RotateAxis axis, int& x, int& y, int& z) const, clutter_actor_get_rotation)
-  _WRAP_METHOD(Fixed get_rotationx(RotateAxis axis, int& x, int& y, int& z) const, clutter_actor_get_rotationx)
   _WRAP_METHOD(double get_rotationu(RotateAxis axis, Unit& x, Unit& y, Unit& z) const, clutter_actor_get_rotationu)
   _WRAP_METHOD(void set_opacity (guint8 opacity), clutter_actor_set_opacity)
   _WRAP_METHOD(guint8 get_opacity() const, clutter_actor_get_opacity)
@@ -205,9 +203,7 @@
   _WRAP_METHOD(void set_depthu(Unit depth), clutter_actor_set_depthu)
   _WRAP_METHOD(int get_depth() const, clutter_actor_get_depth)
   _WRAP_METHOD(Unit get_depthu() const, clutter_actor_get_depthu)
-  _WRAP_METHOD(void set_scalex(Fixed scale_x, Fixed scale_y), clutter_actor_set_scalex)
   _WRAP_METHOD(void set_scale(double scale_x, double scale_y), clutter_actor_set_scale)
-  _WRAP_METHOD(void get_scalex(Fixed& scale_x, Fixed& scale_y) const, clutter_actor_get_scalex)
   _WRAP_METHOD(void get_scale(double& scale_x, double& scale_y) const, clutter_actor_get_scale)
 
   //_WRAP_METHOD(void get_abs_size(guint& width, guint& height) const, clutter_actor_get_abs_size)

Modified: cluttermm/trunk/clutter/src/behaviour-ellipse.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-ellipse.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-ellipse.hg	Sat Mar 14 13:12:30 2009
@@ -32,11 +32,11 @@
 
 protected:
   _WRAP_CTOR(BehaviourEllipse(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, double begin, double end), clutter_behaviour_ellipse_new)
-  _WRAP_CTOR(BehaviourEllipse(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, Fixed begin, Fixed end), clutter_behaviour_ellipse_newx)
+  _WRAP_CTOR(BehaviourEllipse(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, Cogl::Fixed begin, Cogl::Fixed end), clutter_behaviour_ellipse_newx)
 
 public:
   _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, double begin, double end)
-  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, Fixed begin, Fixed end)
+  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, int x, int y, int width, int height, RotateDirection direction, Cogl::Fixed begin, Cogl::Fixed end)
 
   _WRAP_METHOD(void set_center(int x, int y), clutter_behaviour_ellipse_set_center)
   _WRAP_METHOD(void get_center(int& x, int& y) const, clutter_behaviour_ellipse_get_center)
@@ -56,15 +56,15 @@
   _WRAP_METHOD(void set_tilt(double angle_tilt_x, double angle_tilt_y, double angle_tilt_z), clutter_behaviour_ellipse_set_tilt)
   _WRAP_METHOD(void get_tilt(double& angle_tilt_x, double& angle_tilt_y, double& angle_tilt_z) const, clutter_behaviour_ellipse_get_tilt)
 
-  _WRAP_METHOD(void set_angle_startx(Fixed angle_start), clutter_behaviour_ellipse_set_angle_startx)
-  _WRAP_METHOD(Fixed get_angle_startx() const, clutter_behaviour_ellipse_get_angle_startx)
-  _WRAP_METHOD(void set_angle_endx(Fixed angle_end), clutter_behaviour_ellipse_set_angle_endx)
-  _WRAP_METHOD(Fixed get_angle_endx() const, clutter_behaviour_ellipse_get_angle_endx)
-  _WRAP_METHOD(void set_angle_tiltx(RotateAxis axis, Fixed angle_tilt), clutter_behaviour_ellipse_set_angle_tiltx)
-  _WRAP_METHOD(Fixed get_angle_tiltx(RotateAxis axis) const, clutter_behaviour_ellipse_get_angle_tiltx)
+  _WRAP_METHOD(void set_angle_startx(Cogl::Fixed angle_start), clutter_behaviour_ellipse_set_angle_startx)
+  _WRAP_METHOD(Cogl::Fixed get_angle_startx() const, clutter_behaviour_ellipse_get_angle_startx)
+  _WRAP_METHOD(void set_angle_endx(Cogl::Fixed angle_end), clutter_behaviour_ellipse_set_angle_endx)
+  _WRAP_METHOD(Cogl::Fixed get_angle_endx() const, clutter_behaviour_ellipse_get_angle_endx)
+  _WRAP_METHOD(void set_angle_tiltx(RotateAxis axis, Cogl::Fixed angle_tilt), clutter_behaviour_ellipse_set_angle_tiltx)
+  _WRAP_METHOD(Cogl::Fixed get_angle_tiltx(RotateAxis axis) const, clutter_behaviour_ellipse_get_angle_tiltx)
 
-  _WRAP_METHOD(void set_tiltx(Fixed angle_tilt_x, Fixed angle_tilt_y, Fixed angle_tilt_z), clutter_behaviour_ellipse_set_tiltx)
-  _WRAP_METHOD(void get_tiltx(Fixed& angle_tilt_x, Fixed& angle_tilt_y, Fixed& angle_tilt_z) const, clutter_behaviour_ellipse_get_tiltx)
+  _WRAP_METHOD(void set_tiltx(Cogl::Fixed angle_tilt_x, Cogl::Fixed angle_tilt_y, Cogl::Fixed angle_tilt_z), clutter_behaviour_ellipse_set_tiltx)
+  _WRAP_METHOD(void get_tiltx(Cogl::Fixed& angle_tilt_x, Cogl::Fixed& angle_tilt_y, Cogl::Fixed& angle_tilt_z) const, clutter_behaviour_ellipse_get_tiltx)
 
   _WRAP_METHOD(void set_direction(RotateDirection direction), clutter_behaviour_ellipse_set_direction)
   _WRAP_METHOD(RotateDirection get_direction() const, clutter_behaviour_ellipse_get_direction)

Modified: cluttermm/trunk/clutter/src/behaviour-rotate.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-rotate.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-rotate.hg	Sat Mar 14 13:12:30 2009
@@ -32,11 +32,11 @@
 
 protected:
   _WRAP_CTOR(BehaviourRotate(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, double angle_begin, double angle_end), clutter_behaviour_rotate_new)
-  _WRAP_CTOR(BehaviourRotate(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, Fixed angle_begin, Fixed angle_end), clutter_behaviour_rotate_newx)
+  _WRAP_CTOR(BehaviourRotate(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, Cogl::Fixed angle_begin, Cogl::Fixed angle_end), clutter_behaviour_rotate_newx)
 
 public:
   _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, double angle_begin, double angle_end)
-  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, Fixed angle_begin, Fixed angle_end)
+  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, RotateAxis axis, RotateDirection direction, Cogl::Fixed angle_begin, Cogl::Fixed angle_end)
 
   _WRAP_METHOD(void set_axis(RotateAxis axis), clutter_behaviour_rotate_set_axis)
   _WRAP_METHOD(RotateAxis get_axis() const, clutter_behaviour_rotate_get_axis)
@@ -50,8 +50,8 @@
   _WRAP_METHOD(void set_bounds(double angle_begin, double angle_end), clutter_behaviour_rotate_set_bounds)
   _WRAP_METHOD(void get_bounds(double& angle_begin, double& angle_end) const, clutter_behaviour_rotate_get_bounds)
 
-  _WRAP_METHOD(void set_boundsx(Fixed angle_begin, Fixed angle_end), clutter_behaviour_rotate_set_boundsx)
-  _WRAP_METHOD(void get_boundsx(Fixed& angle_begin, Fixed& angle_end) const, clutter_behaviour_rotate_get_boundsx)
+  _WRAP_METHOD(void set_boundsx(Cogl::Fixed angle_begin, Cogl::Fixed angle_end), clutter_behaviour_rotate_set_boundsx)
+  _WRAP_METHOD(void get_boundsx(Cogl::Fixed& angle_begin, Cogl::Fixed& angle_end) const, clutter_behaviour_rotate_get_boundsx)
 
   _WRAP_PROPERTY("angle-end", double)
   _WRAP_PROPERTY("angle-start", double)

Modified: cluttermm/trunk/clutter/src/behaviour-scale.hg
==============================================================================
--- cluttermm/trunk/clutter/src/behaviour-scale.hg	(original)
+++ cluttermm/trunk/clutter/src/behaviour-scale.hg	Sat Mar 14 13:12:30 2009
@@ -32,16 +32,16 @@
 
 protected:
   _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end), clutter_behaviour_scale_new)
-  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, Fixed x_scale_start, Fixed y_scale_start, Fixed x_scale_end, Fixed y_scale_end), clutter_behaviour_scale_newx)
+  _WRAP_CTOR(BehaviourScale(const Glib::RefPtr<Alpha>& alpha, Cogl::Fixed x_scale_start, Cogl::Fixed y_scale_start, Cogl::Fixed x_scale_end, Cogl::Fixed y_scale_end), clutter_behaviour_scale_newx)
 
 public:
   _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end)
-  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, Fixed x_scale_start, Fixed y_scale_start, Fixed x_scale_end, Fixed y_scale_end)
+  _WRAP_CREATE(const Glib::RefPtr<Alpha>& alpha, Cogl::Fixed x_scale_start, Cogl::Fixed y_scale_start, Cogl::Fixed x_scale_end, Cogl::Fixed y_scale_end)
 
   _WRAP_METHOD(void set_bounds(double x_scale_start, double y_scale_start, double x_scale_end, double y_scale_end), clutter_behaviour_scale_set_bounds)
   _WRAP_METHOD(void get_bounds(double& x_scale_start, double& y_scale_start, double& x_scale_end, double& y_scale_end) const, clutter_behaviour_scale_get_bounds)
-  _WRAP_METHOD(void set_boundsx(Fixed x_scale_start, Fixed y_scale_start, Fixed x_scale_end, Fixed y_scale_end), clutter_behaviour_scale_set_boundsx)
-  _WRAP_METHOD(void get_boundsx(Fixed& x_scale_start, Fixed& y_scale_start, Fixed& x_scale_end, Fixed& y_scale_end) const, clutter_behaviour_scale_get_boundsx)
+  _WRAP_METHOD(void set_boundsx(Cogl::Fixed x_scale_start, Cogl::Fixed y_scale_start, Cogl::Fixed x_scale_end, Cogl::Fixed y_scale_end), clutter_behaviour_scale_set_boundsx)
+  _WRAP_METHOD(void get_boundsx(Cogl::Fixed& x_scale_start, Cogl::Fixed& y_scale_start, Cogl::Fixed& x_scale_end, Cogl::Fixed& y_scale_end) const, clutter_behaviour_scale_get_boundsx)
 
   _WRAP_PROPERTY("x-scale-start", double)
   _WRAP_PROPERTY("x-scale-end", double)

Modified: cluttermm/trunk/clutter/src/clutter_methods.defs
==============================================================================
--- cluttermm/trunk/clutter/src/clutter_methods.defs	(original)
+++ cluttermm/trunk/clutter/src/clutter_methods.defs	Sat Mar 14 13:12:30 2009
@@ -130,6 +130,13 @@
   (gtype-id "CLUTTER_TYPE_MODEL")
 )
 
+(define-object ListModel
+  (in-module "Clutter")
+  (parent "ClutterModel")
+  (c-name "ClutterListModel")
+  (gtype-id "CLUTTER_TYPE_LIST_MODEL")
+)
+
 (define-object ModelIter
   (in-module "Clutter")
   (parent "GObject")
@@ -185,12 +192,6 @@
   (gtype-id "CLUTTER_TYPE_STAGE")
 )
 
-(define-object StageWindow
-  (in-module "Clutter")
-  (c-name "ClutterStageWindow")
-  (gtype-id "CLUTTER_TYPE_STAGE_WINDOW")
-)
-
 (define-object Text
   (in-module "Clutter")
   (parent "ClutterActor")
@@ -232,29 +233,6 @@
   )
 )
 
-(define-flags DebugFlag
-  (in-module "Clutter")
-  (c-name "ClutterDebugFlag")
-  (gtype-id "CLUTTER_TYPE_DEBUG_FLAG")
-  (values
-    '("misc" "CLUTTER_DEBUG_MISC")
-    '("actor" "CLUTTER_DEBUG_ACTOR")
-    '("texture" "CLUTTER_DEBUG_TEXTURE")
-    '("event" "CLUTTER_DEBUG_EVENT")
-    '("paint" "CLUTTER_DEBUG_PAINT")
-    '("gl" "CLUTTER_DEBUG_GL")
-    '("alpha" "CLUTTER_DEBUG_ALPHA")
-    '("behaviour" "CLUTTER_DEBUG_BEHAVIOUR")
-    '("pango" "CLUTTER_DEBUG_PANGO")
-    '("backend" "CLUTTER_DEBUG_BACKEND")
-    '("scheduler" "CLUTTER_DEBUG_SCHEDULER")
-    '("script" "CLUTTER_DEBUG_SCRIPT")
-    '("shader" "CLUTTER_DEBUG_SHADER")
-    '("multistage" "CLUTTER_DEBUG_MULTISTAGE")
-    '("animation" "CLUTTER_DEBUG_ANIMATION")
-  )
-)
-
 (define-flags ModifierType
   (in-module "Clutter")
   (c-name "ClutterModifierType")
@@ -286,7 +264,7 @@
   (c-name "ClutterEventFlags")
   (gtype-id "CLUTTER_TYPE_EVENT_FLAGS")
   (values
-    '("synthetic" "CLUTTER_EVENT_FLAG_SYNTHETIC")
+    '("c" "CLUTTER_EVENT_FLAG_SYNTHETIC")
   )
 )
 
@@ -380,33 +358,6 @@
   )
 )
 
-(define-flags PrivateFlags
-  (in-module "Clutter")
-  (c-name "ClutterPrivateFlags")
-  (gtype-id "CLUTTER_TYPE_PRIVATE_FLAGS")
-  (values
-    '("actor-unused-flag" "CLUTTER_ACTOR_UNUSED_FLAG")
-    '("actor-in-destruction" "CLUTTER_ACTOR_IN_DESTRUCTION")
-    '("actor-is-toplevel" "CLUTTER_ACTOR_IS_TOPLEVEL")
-    '("actor-in-reparent" "CLUTTER_ACTOR_IN_REPARENT")
-    '("actor-sync-matrices" "CLUTTER_ACTOR_SYNC_MATRICES")
-    '("actor-in-paint" "CLUTTER_ACTOR_IN_PAINT")
-    '("actor-in-relayout" "CLUTTER_ACTOR_IN_RELAYOUT")
-    '("texture-in-clone-paint" "CLUTTER_TEXTURE_IN_CLONE_PAINT")
-  )
-)
-
-(define-enum PickMode
-  (in-module "Clutter")
-  (c-name "ClutterPickMode")
-  (gtype-id "CLUTTER_TYPE_PICK_MODE")
-  (values
-    '("none" "CLUTTER_PICK_NONE")
-    '("reactive" "CLUTTER_PICK_REACTIVE")
-    '("all" "CLUTTER_PICK_ALL")
-  )
-)
-
 (define-enum ScriptError
   (in-module "Clutter")
   (c-name "ClutterScriptError")
@@ -506,8 +457,8 @@
   (c-name "ClutterRotateDirection")
   (gtype-id "CLUTTER_TYPE_ROTATE_DIRECTION")
   (values
-    '("cw" "CLUTTER_ROTATE_CW")
-    '("ccw" "CLUTTER_ROTATE_CCW")
+    '("w" "CLUTTER_ROTATE_CW")
+    '("cw" "CLUTTER_ROTATE_CCW")
   )
 )
 
@@ -1967,6 +1918,44 @@
   (varargs #t)
 )
 
+(define-method animatev
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animatev")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("guint" "duration")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
+(define-method animate_with_timelinev
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_timelinev")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("gulong" "mode")
+    '("ClutterTimeline*" "timeline")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
+(define-method animate_with_alphav
+  (of-object "ClutterActor")
+  (c-name "clutter_actor_animate_with_alphav")
+  (return-type "ClutterAnimation*")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+    '("gint" "n_properties")
+    '("const-gchar*-const[]" "properties")
+    '("const-GValue*" "values")
+  )
+)
+
 
 
 ;; From clutter-backend.h
@@ -2031,14 +2020,14 @@
   (c-name "clutter_backend_set_font_options")
   (return-type "none")
   (parameters
-    '("cairo_font_options_t*" "options")
+    '("const-cairo_font_options_t*" "options")
   )
 )
 
 (define-method get_font_options
   (of-object "ClutterBackend")
   (c-name "clutter_backend_get_font_options")
-  (return-type "cairo_font_options_t*")
+  (return-type "const-cairo_font_options_t*")
 )
 
 (define-method set_font_name
@@ -2131,8 +2120,8 @@
     '("gint" "width")
     '("gint" "height")
     '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "start")
-    '("ClutterFixed" "end")
+    '("CoglFixed" "start")
+    '("CoglFixed" "end")
   )
 )
 
@@ -2200,14 +2189,14 @@
   (c-name "clutter_behaviour_ellipse_set_angle_startx")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_start")
+    '("CoglFixed" "angle_start")
   )
 )
 
 (define-method get_angle_startx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_startx")
-  (return-type "ClutterFixed")
+  (return-type "CoglFixed")
 )
 
 (define-method get_angle_start
@@ -2221,7 +2210,7 @@
   (c-name "clutter_behaviour_ellipse_set_angle_endx")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_end")
+    '("CoglFixed" "angle_end")
   )
 )
 
@@ -2237,7 +2226,7 @@
 (define-method get_angle_endx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_endx")
-  (return-type "ClutterFixed")
+  (return-type "CoglFixed")
 )
 
 (define-method get_angle_end
@@ -2252,7 +2241,7 @@
   (return-type "none")
   (parameters
     '("ClutterRotateAxis" "axis")
-    '("ClutterFixed" "angle_tilt")
+    '("CoglFixed" "angle_tilt")
   )
 )
 
@@ -2269,7 +2258,7 @@
 (define-method get_angle_tiltx
   (of-object "ClutterBehaviourEllipse")
   (c-name "clutter_behaviour_ellipse_get_angle_tiltx")
-  (return-type "ClutterFixed")
+  (return-type "CoglFixed")
   (parameters
     '("ClutterRotateAxis" "axis")
   )
@@ -2300,9 +2289,9 @@
   (c-name "clutter_behaviour_ellipse_set_tiltx")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_tilt_x")
-    '("ClutterFixed" "angle_tilt_y")
-    '("ClutterFixed" "angle_tilt_z")
+    '("CoglFixed" "angle_tilt_x")
+    '("CoglFixed" "angle_tilt_y")
+    '("CoglFixed" "angle_tilt_z")
   )
 )
 
@@ -2322,9 +2311,9 @@
   (c-name "clutter_behaviour_ellipse_get_tiltx")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "angle_tilt_x")
-    '("ClutterFixed*" "angle_tilt_y")
-    '("ClutterFixed*" "angle_tilt_z")
+    '("CoglFixed*" "angle_tilt_x")
+    '("CoglFixed*" "angle_tilt_y")
+    '("CoglFixed*" "angle_tilt_z")
   )
 )
 
@@ -2345,94 +2334,6 @@
 
 
 
-;; From clutter-behaviour.h
-
-(define-function clutter_behaviour_get_type
-  (c-name "clutter_behaviour_get_type")
-  (return-type "GType")
-)
-
-(define-method apply
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_apply")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method remove
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove")
-  (return-type "none")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-(define-method remove_all
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_remove_all")
-  (return-type "none")
-)
-
-(define-method actors_foreach
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_actors_foreach")
-  (return-type "none")
-  (parameters
-    '("ClutterBehaviourForeachFunc" "func")
-    '("gpointer" "data")
-  )
-)
-
-(define-method get_n_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_n_actors")
-  (return-type "gint")
-)
-
-(define-method get_nth_actor
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_nth_actor")
-  (return-type "ClutterActor*")
-  (parameters
-    '("gint" "index_")
-  )
-)
-
-(define-method get_actors
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_actors")
-  (return-type "GSList*")
-)
-
-(define-method get_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_get_alpha")
-  (return-type "ClutterAlpha*")
-)
-
-(define-method set_alpha
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_set_alpha")
-  (return-type "none")
-  (parameters
-    '("ClutterAlpha*" "alpha")
-  )
-)
-
-(define-method is_applied
-  (of-object "ClutterBehaviour")
-  (c-name "clutter_behaviour_is_applied")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterActor*" "actor")
-  )
-)
-
-
-
 ;; From clutter-behaviour-opacity.h
 
 (define-function clutter_behaviour_opacity_get_type
@@ -2553,8 +2454,8 @@
     '("ClutterAlpha*" "alpha")
     '("ClutterRotateAxis" "axis")
     '("ClutterRotateDirection" "direction")
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("CoglFixed" "angle_start")
+    '("CoglFixed" "angle_end")
   )
 )
 
@@ -2635,8 +2536,8 @@
   (c-name "clutter_behaviour_rotate_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "angle_start")
-    '("ClutterFixed*" "angle_end")
+    '("CoglFixed*" "angle_start")
+    '("CoglFixed*" "angle_end")
   )
 )
 
@@ -2645,8 +2546,8 @@
   (c-name "clutter_behaviour_rotate_set_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterFixed" "angle_start")
-    '("ClutterFixed" "angle_end")
+    '("CoglFixed" "angle_start")
+    '("CoglFixed" "angle_end")
   )
 )
 
@@ -2677,10 +2578,10 @@
   (return-type "ClutterBehaviour*")
   (parameters
     '("ClutterAlpha*" "alpha")
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
+    '("CoglFixed" "x_scale_start")
+    '("CoglFixed" "y_scale_start")
+    '("CoglFixed" "x_scale_end")
+    '("CoglFixed" "y_scale_end")
   )
 )
 
@@ -2696,18 +2597,6 @@
   )
 )
 
-(define-method set_boundsx
-  (of-object "ClutterBehaviourScale")
-  (c-name "clutter_behaviour_scale_set_boundsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed" "x_scale_start")
-    '("ClutterFixed" "y_scale_start")
-    '("ClutterFixed" "x_scale_end")
-    '("ClutterFixed" "y_scale_end")
-  )
-)
-
 (define-method get_bounds
   (of-object "ClutterBehaviourScale")
   (c-name "clutter_behaviour_scale_get_bounds")
@@ -2720,21 +2609,117 @@
   )
 )
 
+(define-method set_boundsx
+  (of-object "ClutterBehaviourScale")
+  (c-name "clutter_behaviour_scale_set_boundsx")
+  (return-type "none")
+  (parameters
+    '("CoglFixed" "x_scale_start")
+    '("CoglFixed" "y_scale_start")
+    '("CoglFixed" "x_scale_end")
+    '("CoglFixed" "y_scale_end")
+  )
+)
+
 (define-method get_boundsx
   (of-object "ClutterBehaviourScale")
   (c-name "clutter_behaviour_scale_get_boundsx")
   (return-type "none")
   (parameters
-    '("ClutterFixed*" "x_scale_start")
-    '("ClutterFixed*" "y_scale_start")
-    '("ClutterFixed*" "x_scale_end")
-    '("ClutterFixed*" "y_scale_end")
+    '("CoglFixed*" "x_scale_start")
+    '("CoglFixed*" "y_scale_start")
+    '("CoglFixed*" "x_scale_end")
+    '("CoglFixed*" "y_scale_end")
+  )
+)
+
+
+
+;; From clutter-behaviour.h
+
+(define-function clutter_behaviour_get_type
+  (c-name "clutter_behaviour_get_type")
+  (return-type "GType")
+)
+
+(define-method apply
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_apply")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-method remove
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove")
+  (return-type "none")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
+
+(define-method remove_all
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_remove_all")
+  (return-type "none")
+)
+
+(define-method actors_foreach
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_actors_foreach")
+  (return-type "none")
+  (parameters
+    '("ClutterBehaviourForeachFunc" "func")
+    '("gpointer" "data")
+  )
+)
+
+(define-method get_n_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_n_actors")
+  (return-type "gint")
+)
+
+(define-method get_nth_actor
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_nth_actor")
+  (return-type "ClutterActor*")
+  (parameters
+    '("gint" "index_")
   )
 )
 
+(define-method get_actors
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_actors")
+  (return-type "GSList*")
+)
+
+(define-method get_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_get_alpha")
+  (return-type "ClutterAlpha*")
+)
 
+(define-method set_alpha
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_set_alpha")
+  (return-type "none")
+  (parameters
+    '("ClutterAlpha*" "alpha")
+  )
+)
 
-;; From clutter-bezier.h
+(define-method is_applied
+  (of-object "ClutterBehaviour")
+  (c-name "clutter_behaviour_is_applied")
+  (return-type "gboolean")
+  (parameters
+    '("ClutterActor*" "actor")
+  )
+)
 
 
 
@@ -2993,6 +2978,11 @@
 
 ;; From clutter-color.h
 
+(define-function clutter_color_get_type
+  (c-name "clutter_color_get_type")
+  (return-type "GType")
+)
+
 (define-function clutter_color_new
   (c-name "clutter_color_new")
   (is-constructor-of "ClutterColor")
@@ -3017,61 +3007,32 @@
   (return-type "none")
 )
 
-(define-function clutter_color_parse
-  (c-name "clutter_color_parse")
-  (return-type "gboolean")
+(define-method add
+  (of-object "ClutterColor")
+  (c-name "clutter_color_add")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "color")
-    '("ClutterColor*" "dest")
+    '("const-ClutterColor*" "b")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method equal
+(define-method subtract
   (of-object "ClutterColor")
-  (c-name "clutter_color_equal")
-  (return-type "gboolean")
+  (c-name "clutter_color_subtract")
+  (return-type "none")
   (parameters
     '("const-ClutterColor*" "b")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method to_string
-  (of-object "ClutterColor")
-  (c-name "clutter_color_to_string")
-  (return-type "gchar*")
-)
-
-(define-function clutter_color_get_type
-  (c-name "clutter_color_get_type")
-  (return-type "GType")
-)
-
-(define-method add
-  (of-object "ClutterColor")
-  (c-name "clutter_color_add")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method subtract
-  (of-object "ClutterColor")
-  (c-name "clutter_color_subtract")
-  (return-type "none")
-  (parameters
-    '("const-ClutterColor*" "src2")
-    '("ClutterColor*" "dest")
-  )
-)
-
-(define-method lighten
+(define-method lighten
   (of-object "ClutterColor")
   (c-name "clutter_color_lighten")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
+    '("ClutterColor*" "result")
   )
 )
 
@@ -3080,7 +3041,7 @@
   (c-name "clutter_color_darken")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
+    '("ClutterColor*" "result")
   )
 )
 
@@ -3089,40 +3050,23 @@
   (c-name "clutter_color_shade")
   (return-type "none")
   (parameters
-    '("ClutterColor*" "dest")
-    '("gdouble" "shade")
-  )
-)
-
-(define-method shadex
-  (of-object "ClutterColor")
-  (c-name "clutter_color_shadex")
-  (return-type "none")
-  (parameters
-    '("ClutterColor*" "dest")
-    '("ClutterFixed" "shade")
+    '("gdouble" "factor")
+    '("ClutterColor*" "result")
   )
 )
 
-(define-method to_hlsx
+(define-method to_string
   (of-object "ClutterColor")
-  (c-name "clutter_color_to_hlsx")
-  (return-type "none")
-  (parameters
-    '("ClutterFixed*" "hue")
-    '("ClutterFixed*" "luminance")
-    '("ClutterFixed*" "saturation")
-  )
+  (c-name "clutter_color_to_string")
+  (return-type "gchar*")
 )
 
-(define-method from_hlsx
+(define-method from_string
   (of-object "ClutterColor")
-  (c-name "clutter_color_from_hlsx")
-  (return-type "none")
+  (c-name "clutter_color_from_string")
+  (return-type "gboolean")
   (parameters
-    '("ClutterFixed" "hue")
-    '("ClutterFixed" "luminance")
-    '("ClutterFixed" "saturation")
+    '("const-gchar*" "str")
   )
 )
 
@@ -3131,9 +3075,9 @@
   (c-name "clutter_color_to_hls")
   (return-type "none")
   (parameters
-    '("guint8*" "hue")
-    '("guint8*" "luminance")
-    '("guint8*" "saturation")
+    '("gfloat*" "hue")
+    '("gfloat*" "luminance")
+    '("gfloat*" "saturation")
   )
 )
 
@@ -3142,9 +3086,9 @@
   (c-name "clutter_color_from_hls")
   (return-type "none")
   (parameters
-    '("guint8" "hue")
-    '("guint8" "luminance")
-    '("guint8" "saturation")
+    '("gfloat" "hue")
+    '("gfloat" "luminance")
+    '("gfloat" "saturation")
   )
 )
 
@@ -3163,6 +3107,23 @@
   )
 )
 
+(define-function clutter_color_hash
+  (c-name "clutter_color_hash")
+  (return-type "guint")
+  (parameters
+    '("gconstpointer" "v")
+  )
+)
+
+(define-function clutter_color_equal
+  (c-name "clutter_color_equal")
+  (return-type "gboolean")
+  (parameters
+    '("gconstpointer" "v1")
+    '("gconstpointer" "v2")
+  )
+)
+
 (define-function clutter_value_set_color
   (c-name "clutter_value_set_color")
   (return-type "none")
@@ -3388,10 +3349,6 @@
 
 
 
-;; From clutter-debug.h
-
-
-
 ;; From clutter-deprecated.h
 
 
@@ -3632,6 +3589,11 @@
   (return-type "ClutterStage*")
 )
 
+(define-function clutter_get_current_event_time
+  (c-name "clutter_get_current_event_time")
+  (return-type "guint32")
+)
+
 
 
 ;; From clutter-feature.h
@@ -3653,11 +3615,6 @@
 
 ;; From clutter-fixed.h
 
-(define-function clutter_fixed_get_type
-  (c-name "clutter_fixed_get_type")
-  (return-type "GType")
-)
-
 (define-function clutter_param_fixed_get_type
   (c-name "clutter_param_fixed_get_type")
   (return-type "GType")
@@ -3668,13 +3625,13 @@
   (return-type "none")
   (parameters
     '("GValue*" "value")
-    '("ClutterFixed" "fixed_")
+    '("CoglFixed" "fixed_")
   )
 )
 
 (define-function clutter_value_get_fixed
   (c-name "clutter_value_get_fixed")
-  (return-type "ClutterFixed")
+  (return-type "CoglFixed")
   (parameters
     '("const-GValue*" "value")
   )
@@ -3687,9 +3644,9 @@
     '("const-gchar*" "name")
     '("const-gchar*" "nick")
     '("const-gchar*" "blurb")
-    '("ClutterFixed" "minimum")
-    '("ClutterFixed" "maximum")
-    '("ClutterFixed" "default_value")
+    '("CoglFixed" "minimum")
+    '("CoglFixed" "maximum")
+    '("CoglFixed" "default_value")
     '("GParamFlags" "flags")
   )
 )
@@ -3813,56 +3770,6 @@
 
 
 
-;; From clutter.h
-
-
-
-;; From clutter-id-pool.h
-
-(define-function clutter_id_pool_new
-  (c-name "clutter_id_pool_new")
-  (is-constructor-of "ClutterIdPool")
-  (return-type "ClutterIDPool*")
-  (parameters
-    '("guint" "initial_size")
-  )
-)
-
-(define-method free
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_free")
-  (return-type "none")
-)
-
-(define-method add
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_add")
-  (return-type "guint32")
-  (parameters
-    '("gpointer" "ptr")
-  )
-)
-
-(define-method remove
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_remove")
-  (return-type "none")
-  (parameters
-    '("guint32" "id")
-  )
-)
-
-(define-method lookup
-  (of-object "ClutterIDPool")
-  (c-name "clutter_id_pool_lookup")
-  (return-type "gpointer")
-  (parameters
-    '("guint32" "id")
-  )
-)
-
-
-
 ;; From clutter-interval.h
 
 (define-function clutter_interval_get_type
@@ -4006,10 +3913,6 @@
 
 
 
-;; From clutter-keysyms-table.h
-
-
-
 ;; From clutter-list-model.h
 
 (define-function clutter_list_model_get_type
@@ -4342,10 +4245,6 @@
 
 
 
-;; From clutter-marshal.h
-
-
-
 ;; From clutter-media.h
 
 (define-function clutter_media_get_type
@@ -4437,7 +4336,7 @@
 (define-method get_duration
   (of-object "ClutterMedia")
   (c-name "clutter_media_get_duration")
-  (return-type "guint")
+  (return-type "gdouble")
 )
 
 
@@ -4779,49 +4678,6 @@
 
 
 
-;; From clutter-model-private.h
-
-(define-method set_n_columns
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_n_columns")
-  (return-type "none")
-  (parameters
-    '("gint" "n_columns")
-    '("gboolean" "set_types")
-    '("gboolean" "set_names")
-  )
-)
-
-(define-function clutter_model_check_type
-  (c-name "clutter_model_check_type")
-  (return-type "gboolean")
-  (parameters
-    '("GType" "gtype")
-  )
-)
-
-(define-method set_column_type
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_column_type")
-  (return-type "none")
-  (parameters
-    '("gint" "column")
-    '("GType" "gtype")
-  )
-)
-
-(define-method set_column_name
-  (of-object "ClutterModel")
-  (c-name "clutter_model_set_column_name")
-  (return-type "none")
-  (parameters
-    '("gint" "column")
-    '("const-gchar*" "name")
-  )
-)
-
-
-
 ;; From clutter-path.h
 
 (define-function clutter_path_get_type
@@ -5079,15 +4935,6 @@
 
 
 
-;; From clutter-private.h
-
-(define-function clutter_context_get_default
-  (c-name "clutter_context_get_default")
-  (return-type "ClutterMainContext*")
-)
-
-
-
 ;; From clutter-rectangle.h
 
 (define-function clutter_rectangle_get_type
@@ -5273,53 +5120,6 @@
 
 
 
-;; From clutter-scriptable.h
-
-(define-function clutter_scriptable_get_type
-  (c-name "clutter_scriptable_get_type")
-  (return-type "GType")
-)
-
-(define-method set_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_id")
-  (return-type "none")
-  (parameters
-    '("const-gchar*" "id")
-  )
-)
-
-(define-method get_id
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_get_id")
-  (return-type "const-gchar*")
-)
-
-(define-method parse_custom_node
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_parse_custom_node")
-  (return-type "gboolean")
-  (parameters
-    '("ClutterScript*" "script")
-    '("GValue*" "value")
-    '("const-gchar*" "name")
-    '("JsonNode*" "node")
-  )
-)
-
-(define-method set_custom_property
-  (of-object "ClutterScriptable")
-  (c-name "clutter_scriptable_set_custom_property")
-  (return-type "none")
-  (parameters
-    '("ClutterScript*" "script")
-    '("const-gchar*" "name")
-    '("const-GValue*" "value")
-  )
-)
-
-
-
 ;; From clutter-script.h
 
 (define-function clutter_script_error_quark
@@ -5456,117 +5256,124 @@
 
 
 
-;; From clutter-script-private.h
+;; From clutter-scriptable.h
 
-(define-function object_info_free
-  (c-name "object_info_free")
-  (return-type "none")
-  (parameters
-    '("gpointer" "data")
-  )
+(define-function clutter_scriptable_get_type
+  (c-name "clutter_scriptable_get_type")
+  (return-type "GType")
 )
 
-(define-function property_info_free
-  (c-name "property_info_free")
+(define-method set_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_id")
   (return-type "none")
   (parameters
-    '("gpointer" "data")
+    '("const-gchar*" "id")
   )
 )
 
-(define-method parse_node
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_node")
+(define-method get_id
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_get_id")
+  (return-type "const-gchar*")
+)
+
+(define-method parse_custom_node
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_parse_custom_node")
   (return-type "gboolean")
   (parameters
+    '("ClutterScript*" "script")
     '("GValue*" "value")
     '("const-gchar*" "name")
     '("JsonNode*" "node")
-    '("GParamSpec*" "pspec")
   )
 )
 
-(define-function clutter_script_get_type_from_symbol
-  (c-name "clutter_script_get_type_from_symbol")
-  (return-type "GType")
+(define-method set_custom_property
+  (of-object "ClutterScriptable")
+  (c-name "clutter_scriptable_set_custom_property")
+  (return-type "none")
   (parameters
-    '("const-gchar*" "symbol")
+    '("ClutterScript*" "script")
+    '("const-gchar*" "name")
+    '("const-GValue*" "value")
   )
 )
 
-(define-function clutter_script_get_type_from_class
-  (c-name "clutter_script_get_type_from_class")
+
+
+;; From clutter-shader-types.h
+
+(define-function clutter_shader_float_get_type
+  (c-name "clutter_shader_float_get_type")
   (return-type "GType")
-  (parameters
-    '("const-gchar*" "name")
-  )
 )
 
-(define-method construct_object
-  (of-object "ClutterScript")
-  (c-name "clutter_script_construct_object")
-  (return-type "GObject*")
-  (parameters
-    '("ObjectInfo*" "info")
-  )
+(define-function clutter_shader_int_get_type
+  (c-name "clutter_shader_int_get_type")
+  (return-type "GType")
 )
 
-(define-function clutter_script_enum_from_string
-  (c-name "clutter_script_enum_from_string")
-  (return-type "gboolean")
+(define-function clutter_shader_matrix_get_type
+  (c-name "clutter_shader_matrix_get_type")
+  (return-type "GType")
+)
+
+(define-function clutter_value_set_shader_float
+  (c-name "clutter_value_set_shader_float")
+  (return-type "none")
   (parameters
-    '("GType" "gtype")
-    '("const-gchar*" "string")
-    '("gint*" "enum_value")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "floats")
   )
 )
 
-(define-function clutter_script_flags_from_string
-  (c-name "clutter_script_flags_from_string")
-  (return-type "gboolean")
+(define-function clutter_value_set_shader_int
+  (c-name "clutter_value_set_shader_int")
+  (return-type "none")
   (parameters
-    '("GType" "gtype")
-    '("const-gchar*" "string")
-    '("gint*" "flags_value")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gint*" "ints")
   )
 )
 
-(define-method parse_knot
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_knot")
-  (return-type "gboolean")
+(define-function clutter_value_set_shader_matrix
+  (c-name "clutter_value_set_shader_matrix")
+  (return-type "none")
   (parameters
-    '("JsonNode*" "node")
-    '("ClutterKnot*" "knot")
+    '("GValue*" "value")
+    '("gint" "size")
+    '("const-gfloat*" "matrix")
   )
 )
 
-(define-method parse_geometry
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_geometry")
-  (return-type "gboolean")
+(define-function clutter_value_get_shader_float
+  (c-name "clutter_value_get_shader_float")
+  (return-type "const-gfloat*")
   (parameters
-    '("JsonNode*" "node")
-    '("ClutterGeometry*" "geometry")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
-(define-method parse_color
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_color")
-  (return-type "gboolean")
+(define-function clutter_value_get_shader_int
+  (c-name "clutter_value_get_shader_int")
+  (return-type "const-COGLint*")
   (parameters
-    '("JsonNode*" "node")
-    '("ClutterColor*" "color")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
-(define-method parse_alpha
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_alpha")
-  (return-type "GObject*")
+(define-function clutter_value_get_shader_matrix
+  (c-name "clutter_value_get_shader_matrix")
+  (return-type "const-gfloat*")
   (parameters
-    '("JsonNode*" "node")
+    '("const-GValue*" "value")
+    '("gsize*" "length")
   )
 )
 
@@ -5698,78 +5505,37 @@
 
 
 
-;; From clutter-shader-types.h
-
-(define-function clutter_shader_float_get_type
-  (c-name "clutter_shader_float_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_shader_int_get_type
-  (c-name "clutter_shader_int_get_type")
-  (return-type "GType")
-)
+;; From clutter-stage-manager.h
 
-(define-function clutter_shader_matrix_get_type
-  (c-name "clutter_shader_matrix_get_type")
+(define-function clutter_stage_manager_get_type
+  (c-name "clutter_stage_manager_get_type")
   (return-type "GType")
 )
 
-(define-function clutter_value_set_shader_float
-  (c-name "clutter_value_set_shader_float")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "floats")
-  )
-)
-
-(define-function clutter_value_set_shader_int
-  (c-name "clutter_value_set_shader_int")
-  (return-type "none")
-  (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gint*" "ints")
-  )
+(define-function clutter_stage_manager_get_default
+  (c-name "clutter_stage_manager_get_default")
+  (return-type "ClutterStageManager*")
 )
 
-(define-function clutter_value_set_shader_matrix
-  (c-name "clutter_value_set_shader_matrix")
+(define-method set_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_set_default_stage")
   (return-type "none")
   (parameters
-    '("GValue*" "value")
-    '("gint" "size")
-    '("const-gfloat*" "matrix")
-  )
-)
-
-(define-function clutter_value_get_shader_float
-  (c-name "clutter_value_get_shader_float")
-  (return-type "const-gfloat*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
+    '("ClutterStage*" "stage")
   )
 )
 
-(define-function clutter_value_get_shader_int
-  (c-name "clutter_value_get_shader_int")
-  (return-type "const-COGLint*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-method get_default_stage
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_get_default_stage")
+  (return-type "ClutterStage*")
 )
 
-(define-function clutter_value_get_shader_matrix
-  (c-name "clutter_value_get_shader_matrix")
-  (return-type "const-GLfloat*")
-  (parameters
-    '("const-GValue*" "value")
-    '("gsize*" "length")
-  )
+(define-method list_stages
+  (of-object "ClutterStageManager")
+  (c-name "clutter_stage_manager_list_stages")
+  (return-type "GSList*")
 )
 
 
@@ -5820,33 +5586,12 @@
   )
 )
 
-(define-method set_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_perspectivex")
-  (return-type "none")
-  (parameters
-    '("ClutterPerspective*" "perspective")
-  )
-)
-
-(define-method get_perspectivex
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_perspectivex")
-  (return-type "none")
-  (parameters
-    '("ClutterPerspective*" "perspective")
-  )
-)
-
 (define-method set_perspective
   (of-object "ClutterStage")
   (c-name "clutter_stage_set_perspective")
   (return-type "none")
   (parameters
-    '("gfloat" "fovy")
-    '("gfloat" "aspect")
-    '("gfloat" "z_near")
-    '("gfloat" "z_far")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
@@ -5855,10 +5600,7 @@
   (c-name "clutter_stage_get_perspective")
   (return-type "none")
   (parameters
-    '("gfloat*" "fovy")
-    '("gfloat*" "aspect")
-    '("gfloat*" "z_near")
-    '("gfloat*" "z_far")
+    '("ClutterPerspective*" "perspective")
   )
 )
 
@@ -5967,9 +5709,7 @@
   (c-name "clutter_stage_set_fog")
   (return-type "none")
   (parameters
-    '("gdouble" "density")
-    '("gdouble" "z_near")
-    '("gdouble" "z_far")
+    '("ClutterFog*" "fog")
   )
 )
 
@@ -5978,26 +5718,6 @@
   (c-name "clutter_stage_get_fog")
   (return-type "none")
   (parameters
-    '("gdouble*" "density")
-    '("gdouble*" "z_near")
-    '("gdouble*" "z_far")
-  )
-)
-
-(define-method set_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_set_fogx")
-  (return-type "none")
-  (parameters
-    '("ClutterFog*" "fog")
-  )
-)
-
-(define-method get_fogx
-  (of-object "ClutterStage")
-  (c-name "clutter_stage_get_fogx")
-  (return-type "none")
-  (parameters
     '("ClutterFog*" "fog")
   )
 )
@@ -6043,50 +5763,6 @@
 
 
 
-;; From clutter-stage-manager.h
-
-(define-function clutter_stage_manager_get_type
-  (c-name "clutter_stage_manager_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_stage_manager_get_default
-  (c-name "clutter_stage_manager_get_default")
-  (return-type "ClutterStageManager*")
-)
-
-(define-method set_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_set_default_stage")
-  (return-type "none")
-  (parameters
-    '("ClutterStage*" "stage")
-  )
-)
-
-(define-method get_default_stage
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_get_default_stage")
-  (return-type "ClutterStage*")
-)
-
-(define-method list_stages
-  (of-object "ClutterStageManager")
-  (c-name "clutter_stage_manager_list_stages")
-  (return-type "GSList*")
-)
-
-
-
-;; From clutter-stage-window.h
-
-(define-function clutter_stage_window_get_type
-  (c-name "clutter_stage_window_get_type")
-  (return-type "GType")
-)
-
-
-
 ;; From clutter-text.h
 
 (define-function clutter_text_get_type
@@ -6143,12 +5819,6 @@
   )
 )
 
-(define-method get_layout
-  (of-object "ClutterText")
-  (c-name "clutter_text_get_layout")
-  (return-type "PangoLayout*")
-)
-
 (define-method set_color
   (of-object "ClutterText")
   (c-name "clutter_text_set_color")
@@ -6545,16 +6215,6 @@
   (return-type "GType")
 )
 
-(define-function clutter_texture_handle_get_type
-  (c-name "clutter_texture_handle_get_type")
-  (return-type "GType")
-)
-
-(define-function clutter_material_handle_get_type
-  (c-name "clutter_material_handle_get_type")
-  (return-type "GType")
-)
-
 (define-function clutter_texture_new
   (c-name "clutter_texture_new")
   (is-constructor-of "ClutterTexture")
@@ -6855,7 +6515,7 @@
 (define-method get_progressx
   (of-object "ClutterTimeline")
   (c-name "clutter_timeline_get_progressx")
-  (return-type "ClutterFixed")
+  (return-type "CoglFixed")
 )
 
 (define-method set_n_frames
@@ -7062,6 +6722,20 @@
   )
 )
 
+(define-function clutter_units_pixels
+  (c-name "clutter_units_pixels")
+  (return-type "ClutterUnit")
+  (parameters
+    '("gint" "px")
+  )
+)
+
+(define-method s_to_pixels
+  (of-object "ClutterUnit")
+  (c-name "clutter_units_to_pixels")
+  (return-type "gint")
+)
+
 (define-function clutter_unit_get_type
   (c-name "clutter_unit_get_type")
   (return-type "GType")
@@ -7120,3 +6794,7 @@
 ;; From clutter-version.h
 
 
+
+;; From clutter.h
+
+

Modified: cluttermm/trunk/clutter/src/color.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/color.ccg	(original)
+++ cluttermm/trunk/clutter/src/color.ccg	Sat Mar 14 13:12:30 2009
@@ -55,7 +55,7 @@
 
 void Color::set_from_string(const Glib::ustring& color)
 {
-  clutter_color_parse(color.c_str(), this->gobj());
+  clutter_color_from_string(this->gobj(), color.c_str());
 }
 
 void Color::set_from_rgb(guint8 red, guint8 blue, guint8 green)
@@ -84,12 +84,7 @@
 
 void Color::shade(double shade)
 {
-    clutter_color_shade(this->gobj(), this->gobj(), shade);
-}
-
-void Color::shadex(Fixed shade)
-{
-    clutter_color_shadex(this->gobj(), this->gobj(), shade);
+    clutter_color_shade(this->gobj(), shade, this->gobj());
 }
 
 void Color::lighten()

Modified: cluttermm/trunk/clutter/src/color.hg
==============================================================================
--- cluttermm/trunk/clutter/src/color.hg	(original)
+++ cluttermm/trunk/clutter/src/color.hg	Sat Mar 14 13:12:30 2009
@@ -52,10 +52,8 @@
   void set_from_rgb(guint8 red, guint8 blue, guint8 green);
   void set_from_string(const Glib::ustring& color);
   _WRAP_METHOD(Glib::ustring to_string() const, clutter_color_to_string)
-  _WRAP_METHOD(void set_from_hls(guint8 hue, guint8 luminance, guint8 saturation), clutter_color_from_hls)
-  _WRAP_METHOD(void set_from_hlsx(Fixed hue, Fixed luminance, Fixed saturation), clutter_color_from_hlsx)
-  _WRAP_METHOD(void to_hls(guint8& hue, guint8& luminance, guint8& saturation) const, clutter_color_to_hls)
-  _WRAP_METHOD(void to_hlsx(Fixed& hue, Fixed& luminance, Fixed& saturation) const, clutter_color_to_hlsx)
+  _WRAP_METHOD(void set_from_hls(float hue, float luminance, float saturation), clutter_color_from_hls)
+  _WRAP_METHOD(void to_hls(float& hue, float& luminance, float& saturation) const, clutter_color_to_hls)
   _WRAP_METHOD(void set_from_pixel(guint32 pixel), clutter_color_from_pixel)
   _WRAP_METHOD(guint32 to_pixel() const, clutter_color_to_pixel)
 
@@ -87,10 +85,6 @@
   _WRAP_METHOD_DOCS_ONLY(clutter_color_shade)
   void shade(double shade);
   _IGNORE(clutter_color_shade)
-  _WRAP_METHOD_DOCS_ONLY(clutter_color_shadex)
-  void shadex(Fixed shade);
-  _IGNORE(clutter_color_shadex)
-
 
   // provide accessors/mutators to modify the individual members like you could
   // do in C by directly modifying the struct members

Modified: cluttermm/trunk/clutter/src/media.hg
==============================================================================
--- cluttermm/trunk/clutter/src/media.hg	(original)
+++ cluttermm/trunk/clutter/src/media.hg	Sat Mar 14 13:12:30 2009
@@ -36,27 +36,24 @@
   _WRAP_METHOD(Glib::ustring get_uri() const, clutter_media_get_uri)
   _WRAP_METHOD(void set_playing(bool playing=true), clutter_media_set_playing)
   _WRAP_METHOD(bool get_playing() const, clutter_media_get_playing)
-  _WRAP_METHOD(void set_position(int position), clutter_media_set_position)
-  _WRAP_METHOD(int get_position() const, clutter_media_get_position)
-  _WRAP_METHOD(void set_volume(double volume), clutter_media_set_volume)
-  _WRAP_METHOD(double get_volume() const, clutter_media_get_volume)
-  _WRAP_METHOD(int get_buffer_percent() const, clutter_media_get_buffer_percent)
+  _WRAP_METHOD(void set_audio_volume(double volume), clutter_media_set_audio_volume)
+  _WRAP_METHOD(double get_audio_volume() const, clutter_media_get_audio_volume)
+  _WRAP_METHOD(double get_buffer_percent() const, clutter_media_get_buffer_fill)
   _WRAP_METHOD(void set_filename(const Glib::ustring& filename), clutter_media_set_filename)
   _WRAP_METHOD(bool get_can_seek() const, clutter_media_get_can_seek)
-  _WRAP_METHOD(guint get_duration() const, clutter_media_get_duration)
+  _WRAP_METHOD(double get_duration() const, clutter_media_get_duration)
 
 
   _WRAP_SIGNAL(void eos(), "eos")
   // TODO: figure out what to do with this GError parameter
   //_WRAP_SIGNAL(void error(GError* error), "error")
 
-  _WRAP_PROPERTY("buffer-percent", int)
+  _WRAP_PROPERTY("buffer-fill", double)
   _WRAP_PROPERTY("can-seek", bool)
   _WRAP_PROPERTY("duration", guint)
   _WRAP_PROPERTY("playing", bool)
-  _WRAP_PROPERTY("position", int)
   _WRAP_PROPERTY("uri", Glib::ustring)
-  _WRAP_PROPERTY("volume", double)
+  _WRAP_PROPERTY("audio-volume", double)
 
   //TODO: There are probably some extra propertys in clutter-0.10.
 

Modified: cluttermm/trunk/clutter/src/stage.ccg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.ccg	(original)
+++ cluttermm/trunk/clutter/src/stage.ccg	Sat Mar 14 13:12:30 2009
@@ -20,7 +20,7 @@
 namespace Clutter
 {
 
-Perspective::Perspective(Fixed fovy, Fixed aspect, Fixed z_near, Fixed z_far)
+Perspective::Perspective(Cogl::Fixed fovy, Cogl::Fixed aspect, Cogl::Fixed z_near, Cogl::Fixed z_far)
 {
   gobject_.fovy = fovy;
   gobject_.aspect = aspect;
@@ -35,13 +35,6 @@
   return color;
 }
 
-Perspective Stage::get_perspectivex() const
-{
-  Perspective perspective;
-  clutter_stage_get_perspectivex(const_cast<ClutterStage*>(gobj()), perspective.gobj());
-  return perspective;
-}
-
 void Stage::set_key_focus()
 {
   clutter_stage_set_key_focus(gobj(), NULL);

Modified: cluttermm/trunk/clutter/src/stage.hg
==============================================================================
--- cluttermm/trunk/clutter/src/stage.hg	(original)
+++ cluttermm/trunk/clutter/src/stage.hg	Sat Mar 14 13:12:30 2009
@@ -31,16 +31,16 @@
 {
   _CLASS_BOXEDTYPE_STATIC(Perspective, ClutterPerspective)
 public:
-  Perspective(Fixed fovy, Fixed aspect, Fixed z_near, Fixed z_far);
+  Perspective(Cogl::Fixed fovy, Cogl::Fixed aspect, Cogl::Fixed z_near, Cogl::Fixed z_far);
 
-  _MEMBER_GET(fovy, fovy, Fixed, ClutterFixed)
-  _MEMBER_SET(fovy, fovy, Fixed, ClutterFixed)
-  _MEMBER_GET(aspect, aspect, Fixed, ClutterFixed)
-  _MEMBER_SET(aspect, aspect, Fixed, ClutterFixed)
-  _MEMBER_GET(z_near, z_near, Fixed, ClutterFixed)
-  _MEMBER_SET(z_near, z_near, Fixed, ClutterFixed)
-  _MEMBER_GET(z_far, z_far, Fixed, ClutterFixed)
-  _MEMBER_SET(z_far, z_far, Fixed, ClutterFixed)
+  _MEMBER_GET(fovy, fovy, Cogl::Fixed, CoglFixed)
+  _MEMBER_SET(fovy, fovy, Cogl::Fixed, CoglFixed)
+  _MEMBER_GET(aspect, aspect, Cogl::Fixed, CoglFixed)
+  _MEMBER_SET(aspect, aspect, Cogl::Fixed, CoglFixed)
+  _MEMBER_GET(z_near, z_near, Cogl::Fixed, CoglFixed)
+  _MEMBER_SET(z_near, z_near, Cogl::Fixed, CoglFixed)
+  _MEMBER_GET(z_far, z_far, Cogl::Fixed, CoglFixed)
+  _MEMBER_SET(z_far, z_far, Cogl::Fixed, CoglFixed)
 };
 
 class Stage :
@@ -59,12 +59,10 @@
   Color get_color() const;
 
 #m4 _CONVERSION(`const Perspective&', `ClutterPerspective*',`const_cast<$2>(($3).gobj())')
-  _WRAP_METHOD(void set_perspectivex(const Perspective& perspective), clutter_stage_set_perspectivex)
-  _WRAP_METHOD_DOCS_ONLY(clutter_stage_get_perspectivex)
-  Perspective get_perspectivex() const;
+#m4 _CONVERSION(`Perspective&', `ClutterPerspective*',`const_cast<$2>(($3).gobj())')
 
-  _WRAP_METHOD(void set_perspective(float fovy, float aspect, float z_near, float z_far), clutter_stage_set_perspective)
-  _WRAP_METHOD(void get_perspective(float& fovy, float& aspect, float& z_near, float& z_far), clutter_stage_get_perspective)
+  _WRAP_METHOD(void set_perspective(const Perspective& prespective), clutter_stage_set_perspective)
+  _WRAP_METHOD(void get_perspective(Perspective& prespective), clutter_stage_get_perspective)
   _WRAP_METHOD(void fullscreen(), clutter_stage_fullscreen)
   _WRAP_METHOD(void unfullscreen(), clutter_stage_unfullscreen)
   _WRAP_METHOD(void show_cursor(), clutter_stage_show_cursor)
@@ -88,13 +86,9 @@
   _WRAP_METHOD(guchar* read_pixels(int x, int y, int width, int height) const, clutter_stage_read_pixels)
   _WRAP_METHOD(bool get_use_fog() const, clutter_stage_get_use_fog)
   _WRAP_METHOD(void set_use_fog(bool fog = true), clutter_stage_set_use_fog)
-  _WRAP_METHOD(void set_fog(double density, double z_near, double z_far), clutter_stage_set_fog)
-  _WRAP_METHOD(void get_fog(double& density, double& z_near, double& z_far) const, clutter_stage_get_fog)
 #m4 _CONVERSION(`const Fog&',`ClutterFog*',`const_cast<ClutterFog*>(&($3))')
-  _WRAP_METHOD(void set_fogx(const Fog& fog), clutter_stage_set_fogx)
-  _WRAP_METHOD(void get_fogx(Fog& fog) const, clutter_stage_get_fogx)
-  _WRAP_METHOD(double get_resolution() const, clutter_stage_get_resolution)
-  _WRAP_METHOD(Fixed get_resolutionx() const, clutter_stage_get_resolutionx)
+  _WRAP_METHOD(void set_fog(const Fog& fog), clutter_stage_set_fog)
+  _WRAP_METHOD(void get_fog(Fog& fog) const, clutter_stage_get_fog)
   
   _WRAP_METHOD(void stage_event(Event* event), clutter_stage_event)
   _WRAP_METHOD(bool is_default() const, clutter_stage_is_default)

Modified: cluttermm/trunk/clutter/src/text.hg
==============================================================================
--- cluttermm/trunk/clutter/src/text.hg	(original)
+++ cluttermm/trunk/clutter/src/text.hg	Sat Mar 14 13:12:30 2009
@@ -54,8 +54,8 @@
   _WRAP_METHOD(Glib::RefPtr<Pango::Layout> get_layout(), clutter_text_get_layout)
   _WRAP_METHOD(Glib::RefPtr<const Pango::Layout> get_layout() const, clutter_text_get_layout, constversion)
 
-  _WRAP_METHOD(Pango::Alignment get_alignment() const, clutter_text_get_alignment)
-  _WRAP_METHOD(void set_alignment(Pango::Alignment wrap_mode), clutter_text_set_alignment)
+  _WRAP_METHOD(Pango::Alignment get_line_alignment() const, clutter_text_get_line_alignment)
+  _WRAP_METHOD(void set_line_alignment(Pango::Alignment wrap_mode), clutter_text_set_line_alignment)
 
   _WRAP_METHOD(int get_cursor_position() const, clutter_text_get_cursor_position)
   _WRAP_METHOD(void set_cursor_position(int position), clutter_text_set_cursor_position)

Modified: cluttermm/trunk/clutter/src/timeline.hg
==============================================================================
--- cluttermm/trunk/clutter/src/timeline.hg	(original)
+++ cluttermm/trunk/clutter/src/timeline.hg	Sat Mar 14 13:12:30 2009
@@ -63,7 +63,7 @@
   _WRAP_METHOD(void set_delay(guint msecs), clutter_timeline_set_delay)
   _WRAP_METHOD(guint get_delay() const, clutter_timeline_get_delay)
   _WRAP_METHOD(double get_progress() const, clutter_timeline_get_progress)
-  _WRAP_METHOD(Fixed get_progressx() const, clutter_timeline_get_progressx)
+  _WRAP_METHOD(Cogl::Fixed get_progressx() const, clutter_timeline_get_progressx)
   _WRAP_METHOD(void set_direction(TimelineDirection direction), clutter_timeline_set_direction)
   _WRAP_METHOD(TimelineDirection get_direction() const, clutter_timeline_get_direction)
 

Modified: cluttermm/trunk/clutter/src/types.hg
==============================================================================
--- cluttermm/trunk/clutter/src/types.hg	(original)
+++ cluttermm/trunk/clutter/src/types.hg	Sat Mar 14 13:12:30 2009
@@ -16,8 +16,14 @@
  */
 
 #include <clutter/clutter.h>
+#include <cogl/cogl.h>
 
 _DEFS(cluttermm,clutter)
+namespace Cogl
+{
+typedef CoglAngle Angle;
+typedef CoglFixed Fixed;
+} // namespace Cogl
 
 namespace Clutter
 {
@@ -31,8 +37,6 @@
 
 //TODO: Maybe redefine these, to avoid including a C header in our C++ header:
 typedef ClutterUnit Unit;
-typedef ClutterFixed Fixed;
-typedef ClutterAngle Angle;
 
 _WRAP_GERROR(InitError, ClutterInitError, CLUTTER_INIT_ERROR)
 

Modified: cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc
==============================================================================
--- cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	(original)
+++ cluttermm/trunk/tools/extra_defs_gen/generate_defs_clutter.cc	Sat Mar 14 13:12:30 2009
@@ -41,7 +41,7 @@
     << get_defs(CLUTTER_TYPE_COLOR)
     << get_defs(CLUTTER_TYPE_CONTAINER)
     << get_defs(CLUTTER_TYPE_EVENT)
-    << get_defs(CLUTTER_TYPE_FIXED)
+//    << get_defs(CLUTTER_TYPE_FIXED)
     << get_defs(CLUTTER_TYPE_GROUP)
 //    << get_defs(CLUTTER_TYPE_HBOX)
 //    << get_defs(CLUTTER_TYPE_LAYOUT)

Modified: cluttermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment
==============================================================================
--- cluttermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	(original)
+++ cluttermm/trunk/tools/m4/Makefile_list_of_sources.am_fragment	Sat Mar 14 13:12:30 2009
@@ -1 +1 @@
-files_tools_m4 = convert.m4 convert_cluttermm.m4
+files_tools_m4 = convert.m4 convert_cluttermm.m4 convert_coglmm.m4

Modified: cluttermm/trunk/tools/m4/convert.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert.m4	(original)
+++ cluttermm/trunk/tools/m4/convert.m4	Sat Mar 14 13:12:30 2009
@@ -3,4 +3,5 @@
 # Override of the file of the same name in gtkmm.
 
 include(convert_gtkmm.m4)
+include(convert_coglmm.m4)
 include(convert_cluttermm.m4)

Modified: cluttermm/trunk/tools/m4/convert_cluttermm.m4
==============================================================================
--- cluttermm/trunk/tools/m4/convert_cluttermm.m4	(original)
+++ cluttermm/trunk/tools/m4/convert_cluttermm.m4	Sat Mar 14 13:12:30 2009
@@ -65,14 +65,10 @@
 
 _CONVERSION(`guint8&',`guint8*',`&($3)')
 _CONVERSION(`guint8*',`guint8&',`*($3)')
-_CONVERSION(`ClutterFixed&',`ClutterFixed*',`&($3)')
-_CONVERSION(`ClutterFixed*',`ClutterFixed&',`*($3)')
 
 _EQUAL(ClutterUnit,Unit)
 _CONVERSION(`Unit&',`ClutterUnit*',`&($3)')
 
-_EQUAL(ClutterFixed,Fixed)
-_CONVERSION(`Fixed&',`ClutterFixed*',`&($3)')
 _EQUAL(ClutterAngle,Angle)
 _CONVERSION(`Angle&',`ClutterAngle*',`&($3)')
 _EQUAL(ClutterFog,Fog)

Added: cluttermm/trunk/tools/m4/convert_coglmm.m4
==============================================================================
--- (empty file)
+++ cluttermm/trunk/tools/m4/convert_coglmm.m4	Sat Mar 14 13:12:30 2009
@@ -0,0 +1,4 @@
+_EQUAL(CoglFixed,Fixed)
+_CONVERSION(`Cogl::Fixed&',`CoglFixed*',`&($3)')
+_CONVERSION(`CoglFixed',`Cogl::Fixed',`($2)($3)')
+_CONVERSION(`Cogl::Fixed',`CoglFixed',`($2)($3)')
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]