GNOME.org
 

[cluttermm] Wrapped more new clutter 1.2 API.

commit 18c9c5908c999b5c8e3899392487a9a30869fcdc
Author: Murray Cumming <murrayc murrayc com>
Date:   Sun Apr 18 22:04:04 2010 +0200

    Wrapped more new clutter 1.2 API.
    
    * clutter/src/animation.hg:
    * clutter/src/behaviour-ellipse.hg:
    * clutter/src/behaviour-rotate.hg:
    * clutter/src/behaviour-scale.hg:
    * clutter/src/clutter_methods.defs:
    * clutter/src/media.hg:
    * clutter/src/script.hg:
    * clutter/src/stage.hg:
    * clutter/src/text.hg:
    * clutter/src/timeline.hg:
    * clutter/src/types.[hg|ccg]: Added new (clutter 1.2) methods and
    removed mentions of clutter funcitons that were removed (probably in clutter
    1.0).

 ChangeLog                        |   20 ++++-
 clutter/src/actor.hg             |    2 -
 clutter/src/animation.hg         |    6 ++
 clutter/src/behaviour-ellipse.hg |   12 ---
 clutter/src/behaviour-rotate.hg  |    5 -
 clutter/src/behaviour-scale.hg   |    4 -
 clutter/src/clutter_methods.defs |  169 --------------------------------------
 clutter/src/media.hg             |    4 +
 clutter/src/script.hg            |    6 ++
 clutter/src/stage.hg             |   15 +++-
 clutter/src/text.hg              |    7 ++
 clutter/src/timeline.hg          |   13 +--
 clutter/src/types.ccg            |   12 ++--
 clutter/src/types.hg             |    2 +-
 14 files changed, 66 insertions(+), 211 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a78c77d..c27e4bc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,24 @@
 2010-04-18  Murray Cumming  <murrayc murrayc com>
 
-	Actor: Wrapped new clutter-1.2 API.
+	Wrapped more new clutter 1.2 API.
+	
+	* clutter/src/animation.hg:
+	* clutter/src/behaviour-ellipse.hg:
+	* clutter/src/behaviour-rotate.hg:
+	* clutter/src/behaviour-scale.hg:
+	* clutter/src/clutter_methods.defs:
+	* clutter/src/media.hg:
+	* clutter/src/script.hg:
+	* clutter/src/stage.hg:
+	* clutter/src/text.hg:
+	* clutter/src/timeline.hg:
+	* clutter/src/types.[hg|ccg]: Added new (clutter 1.2) methods and 
+	removed mentions of clutter funcitons that were removed (probably in clutter 
+	1.0).
+
+2010-04-18  Murray Cumming  <murrayc murrayc com>
+
+	Actor: Wrapped new clutter 1.2 API.
 	
 	* clutter/src/clutter_enums.defs: Really regenerated with enums.pl
 	* clutter/src/types.hg: Added TextDirection.
diff --git a/clutter/src/actor.hg b/clutter/src/actor.hg
index 79e5659..2d003f2 100644
--- a/clutter/src/actor.hg
+++ b/clutter/src/actor.hg
@@ -256,8 +256,6 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Animation> get_animation(), clutter_actor_get_animation)
   _WRAP_METHOD(Glib::RefPtr<const Animation> get_animation() const, clutter_actor_get_animation, constversion)
 
-protected:
-
   _WRAP_METHOD(void push_internal(), clutter_actor_push_internal)
   _WRAP_METHOD(void pop_internal(), clutter_actor_pop_internal)
 
diff --git a/clutter/src/animation.hg b/clutter/src/animation.hg
index 7d44971..2a22bd0 100644
--- a/clutter/src/animation.hg
+++ b/clutter/src/animation.hg
@@ -54,9 +54,15 @@ public:
   _WRAP_METHOD(Glib::RefPtr<Alpha> get_alpha() const, clutter_animation_get_alpha)
   _WRAP_METHOD(void completed(), clutter_animation_completed)
   _WRAP_METHOD(Glib::RefPtr<Animation> bind(const std::string& property_name, const Glib::ValueBase& final), clutter_animation_bind)
+   //TODO: Add templated bind().
+   
   _WRAP_METHOD(void bind_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval), clutter_animation_bind_interval)
   _WRAP_METHOD(void update_interval(const std::string& property_name, const Glib::RefPtr<Interval>& interval), clutter_animation_update_interval)
   _WRAP_METHOD(bool has_property(const std::string& property_name) const, clutter_animation_has_property)
+  
+  _WRAP_METHOD(Glib::RefPtr<Animation> update(const std::string& property_name, const Glib::ValueBase& final), clutter_animation_update)
+  //TODO: Add templated update().
+  
   _WRAP_METHOD(void unbind_property(const std::string& property_name), clutter_animation_unbind_property)
   _WRAP_METHOD(Glib::RefPtr<Interval> get_interval(const std::string& property_name) const, clutter_animation_get_interval)
 
diff --git a/clutter/src/behaviour-ellipse.hg b/clutter/src/behaviour-ellipse.hg
index 1aeef96..0f4afa1 100644
--- a/clutter/src/behaviour-ellipse.hg
+++ b/clutter/src/behaviour-ellipse.hg
@@ -32,11 +32,9 @@ class BehaviourEllipse : public Behaviour
 
 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, 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, 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,16 +54,6 @@ public:
   _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(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(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)
 
diff --git a/clutter/src/behaviour-rotate.hg b/clutter/src/behaviour-rotate.hg
index da7a917..4d16132 100644
--- a/clutter/src/behaviour-rotate.hg
+++ b/clutter/src/behaviour-rotate.hg
@@ -32,11 +32,9 @@ class BehaviourRotate : public Behaviour
 
 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, 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, 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,9 +48,6 @@ public:
   _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(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)
   _WRAP_PROPERTY("axis", RotateAxis)
diff --git a/clutter/src/behaviour-scale.hg b/clutter/src/behaviour-scale.hg
index 4b0d570..229ee4e 100644
--- a/clutter/src/behaviour-scale.hg
+++ b/clutter/src/behaviour-scale.hg
@@ -32,16 +32,12 @@ class BehaviourScale : public Behaviour
 
 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, 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, 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(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)
diff --git a/clutter/src/clutter_methods.defs b/clutter/src/clutter_methods.defs
index 0013ae5..8899b9b 100644
--- a/clutter/src/clutter_methods.defs
+++ b/clutter/src/clutter_methods.defs
@@ -5783,59 +5783,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")
-  )
-)
-
-(define-method set_row
-  (of-object "ClutterModelIter")
-  (c-name "clutter_model_iter_set_row")
-  (return-type "none")
-  (parameters
-    '("guint" "row")
-  )
-)
-
-
-
 ;; From clutter-path.h
 
 (define-function clutter_path_get_type
@@ -6092,11 +6039,6 @@
 )
 
 
-
-;; From clutter-private.h
-
-
-
 ;; From clutter-profile.h
 
 
@@ -6469,117 +6411,6 @@
 
 
 
-;; From clutter-script-private.h
-
-(define-function object_info_free
-  (c-name "object_info_free")
-  (return-type "none")
-  (parameters
-    '("gpointer" "data")
-  )
-)
-
-(define-function property_info_free
-  (c-name "property_info_free")
-  (return-type "none")
-  (parameters
-    '("gpointer" "data")
-  )
-)
-
-(define-function clutter_script_parser_get_type
-  (c-name "clutter_script_parser_get_type")
-  (return-type "GType")
-)
-
-(define-method parse_node
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_node")
-  (return-type "gboolean")
-  (parameters
-    '("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")
-  (parameters
-    '("const-gchar*" "symbol")
-  )
-)
-
-(define-function clutter_script_get_type_from_class
-  (c-name "clutter_script_get_type_from_class")
-  (return-type "GType")
-  (parameters
-    '("const-gchar*" "name")
-  )
-)
-
-(define-function clutter_script_resolve_animation_mode
-  (c-name "clutter_script_resolve_animation_mode")
-  (return-type "gulong")
-  (parameters
-    '("JsonNode*" "node")
-  )
-)
-
-(define-function clutter_script_enum_from_string
-  (c-name "clutter_script_enum_from_string")
-  (return-type "gboolean")
-  (parameters
-    '("GType" "gtype")
-    '("const-gchar*" "string")
-    '("gint*" "enum_value")
-  )
-)
-
-(define-function clutter_script_flags_from_string
-  (c-name "clutter_script_flags_from_string")
-  (return-type "gboolean")
-  (parameters
-    '("GType" "gtype")
-    '("const-gchar*" "string")
-    '("gint*" "flags_value")
-  )
-)
-
-(define-method parse_knot
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_knot")
-  (return-type "gboolean")
-  (parameters
-    '("JsonNode*" "node")
-    '("ClutterKnot*" "knot")
-  )
-)
-
-(define-method parse_geometry
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_geometry")
-  (return-type "gboolean")
-  (parameters
-    '("JsonNode*" "node")
-    '("ClutterGeometry*" "geometry")
-  )
-)
-
-(define-method parse_color
-  (of-object "ClutterScript")
-  (c-name "clutter_script_parse_color")
-  (return-type "gboolean")
-  (parameters
-    '("JsonNode*" "node")
-    '("ClutterColor*" "color")
-  )
-)
-
-
-
 ;; From clutter-shader.h
 
 (define-function clutter_shader_error_quark
diff --git a/clutter/src/media.hg b/clutter/src/media.hg
index c87cd33..f190fc2 100644
--- a/clutter/src/media.hg
+++ b/clutter/src/media.hg
@@ -38,6 +38,10 @@ public:
   _WRAP_METHOD(bool get_playing() const, clutter_media_get_playing)
   _WRAP_METHOD(void set_progress(double progress), clutter_media_set_progress)
   _WRAP_METHOD(double get_progress() const, clutter_media_get_progress)
+  _WRAP_METHOD(void set_subtitle_uri(const gchar  *uri), clutter_media_set_subtitle_uri)
+  _WRAP_METHOD(std::string get_subtitle_uri() const, clutter_media_get_subtitle_uri)
+  _WRAP_METHOD(void set_subtitle_font_name(const std::string& font_name), clutter_media_set_subtitle_font_name)
+  _WRAP_METHOD(std::string get_subtitle_font_name() const, clutter_media_get_subtitle_font_name)
   _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)
diff --git a/clutter/src/script.hg b/clutter/src/script.hg
index 137f726..1d9ffe5 100644
--- a/clutter/src/script.hg
+++ b/clutter/src/script.hg
@@ -57,6 +57,12 @@ public:
   //clutter_script_get_objects() is a varargs convenience function for C.
   _IGNORE(clutter_script_get_objects)
 
+#m4 _CONVERSION(`GList*', `Glib::ListHandle<Glib::RefPtr<Glib::Object> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
+#m4 _CONVERSION(`GList*', `Glib::ListHandle<Glib::RefPtr<const Glib::Object> >', `$2($3, Glib::OWNERSHIP_SHALLOW)')
+ 
+  _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<Glib::Object> > list_objects(), clutter_script_list_objects)
+  _WRAP_METHOD(Glib::ListHandle<Glib::RefPtr<const Glib::Object> > list_objects() const, clutter_script_list_objects)
+
   _WRAP_METHOD(void unmerge_object(guint merge_id), clutter_script_unmerge_objects)
   _WRAP_METHOD(void ensure_objects(), clutter_script_ensure_objects)
 
diff --git a/clutter/src/stage.hg b/clutter/src/stage.hg
index e2ae7f5..400ff89 100644
--- a/clutter/src/stage.hg
+++ b/clutter/src/stage.hg
@@ -65,8 +65,8 @@ public:
 
   _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 set_fullscreen(bool fullscreen = true), clutter_stage_set_fullscreen)
+  _WRAP_METHOD(bool get_fullscreen() const, clutter_stage_get_fullscreen)
   _WRAP_METHOD(void show_cursor(), clutter_stage_show_cursor)
   _WRAP_METHOD(void hide_cursor(), clutter_stage_hide_cursor)
   _WRAP_METHOD(Glib::ustring get_title() const, clutter_stage_get_title)
@@ -97,6 +97,17 @@ public:
   _WRAP_METHOD(void ensure_current(), clutter_stage_ensure_current)
   _WRAP_METHOD(void ensure_viewport(), clutter_stage_ensure_viewport)
 
+  _WRAP_METHOD(void ensure_redraw(), clutter_stage_ensure_redraw)
+
+  _WRAP_METHOD(void set_throttle_motion_events(bool throttle = true), clutter_stage_set_throttle_motion_events)
+  _WRAP_METHOD(bool get_throttle_motion_events() const, clutter_stage_get_throttle_motion_events)
+
+  _WRAP_METHOD(void set_use_alpha(bool use_alpha = true), clutter_stage_set_use_alpha)
+  _WRAP_METHOD(bool get_use_alpha() const, clutter_stage_get_use_alpha)
+
+  _WRAP_METHOD(void set_minimum_size(guint width, guint height), clutter_stage_set_minimum_size)
+  _WRAP_METHOD(void get_minimum_size(guint& width, guint& height), clutter_stage_get_minimum_size)
+
   _WRAP_SIGNAL(void fullscreen(), "fullscreen")
   _WRAP_SIGNAL(void unfullscreen(), "unfullscreen")
   _WRAP_SIGNAL(void activate(), "activate")
diff --git a/clutter/src/text.hg b/clutter/src/text.hg
index cd10ab0..32dc6d4 100644
--- a/clutter/src/text.hg
+++ b/clutter/src/text.hg
@@ -62,6 +62,10 @@ public:
   _WRAP_METHOD(void set_font_name(const Glib::ustring& font_name), clutter_text_set_font_name)
   _WRAP_METHOD(Glib::ustring get_font_name() const, clutter_text_get_font_name)
 
+  _WRAP_METHOD(void set_font_description(const Pango::FontDescription& font_desc), clutter_text_set_font_description)
+#m4 _CONVERSION(`PangoFontDescription*',`Pango::FontDescription',`Pango::FontDescription(($3))')
+  _WRAP_METHOD(Pango::FontDescription get_font_description() const, clutter_text_get_font_description)
+  
   _WRAP_METHOD(void set_password_char(gunichar wc), clutter_text_set_password_char)
   _WRAP_METHOD(gunichar get_password_char() const, clutter_text_get_password_char)
 
@@ -131,6 +135,9 @@ public:
 
   _WRAP_METHOD(bool position_to_coords(int position, float &x, float &y, float &line_height), clutter_text_position_to_coords)
 
+#m4 _CONVERSION(`const Pango::AttrList&',`PangoAttrList*',`const_cast<PangoAttrList*>(($3).gobj())')
+  _WRAP_METHOD(void set_preedit_string(const Glib::ustring& preedit_str, const Pango::AttrList& preedit_attrs, guint ursor_pos), clutter_text_set_preedit_string)
+
   _WRAP_SIGNAL(void activate(), "activate")
   _WRAP_SIGNAL(void text_changed(), "text_changed")
   _WRAP_SIGNAL(void cursor_event(const Geometry& geometry), "cursor_event")
diff --git a/clutter/src/timeline.hg b/clutter/src/timeline.hg
index 6d455f0..5938487 100644
--- a/clutter/src/timeline.hg
+++ b/clutter/src/timeline.hg
@@ -40,8 +40,6 @@ public:
 
   _WRAP_METHOD(void set_duration(guint msecs), clutter_timeline_set_duration)
   _WRAP_METHOD(guint get_duration() const, clutter_timeline_get_duration)
-  _WRAP_METHOD(void set_speed(guint fps), clutter_timeline_set_speed)
-  _WRAP_METHOD(guint get_speed() const, clutter_timeline_get_speed)
   _WRAP_METHOD(void start(), clutter_timeline_start)
   _WRAP_METHOD(void pause(), clutter_timeline_pause)
   _WRAP_METHOD(void stop(), clutter_timeline_stop)
@@ -50,32 +48,29 @@ public:
   _WRAP_METHOD(bool get_loop() const, clutter_timeline_get_loop)
   _WRAP_METHOD(void skip(guint n_frames), clutter_timeline_skip)
   _WRAP_METHOD(void advance(guint frame_num), clutter_timeline_advance)
-  _WRAP_METHOD(int get_current_frame() const, clutter_timeline_get_current_frame)
   _WRAP_METHOD(guint get_delta() const, clutter_timeline_get_delta)
-  _WRAP_METHOD(void set_n_frames(guint n_frames), clutter_timeline_set_n_frames)
-  _WRAP_METHOD(guint get_n_frames() const, clutter_timeline_get_n_frames)
   _WRAP_METHOD(bool is_playing() const, clutter_timeline_is_playing)
   _WRAP_METHOD(void set_delay(guint msecs), clutter_timeline_set_delay)
   _WRAP_METHOD(guint get_delay() const, clutter_timeline_get_delay)
+  _WRAP_METHOD(guint get_elapsed_time() const, clutter_timeline_get_elapsed_time)
   _WRAP_METHOD(double get_progress() const, clutter_timeline_get_progress)
-  _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)
 
   _WRAP_METHOD_DOCS_ONLY(clutter_timeline_list_markers)
   Glib::StringArrayHandle list_markers(int frame_num) const;
   _WRAP_METHOD(void add_marker_at_time(const Glib::ustring& marker_name, guint msecs), clutter_timeline_add_marker_at_time)
-  _WRAP_METHOD(void add_marker_at_frame(const Glib::ustring& marker_name, guint frame_num), clutter_timeline_add_marker_at_frame)
   _WRAP_METHOD(bool has_marker(const Glib::ustring& marker_name), clutter_timeline_has_marker)
   _WRAP_METHOD(void remove_marker(const Glib::ustring& marker_name), clutter_timeline_remove_marker)
   _WRAP_METHOD(void advance_to_marker(const Glib::ustring& marker_name), clutter_timeline_advance_to_marker)
 
+  //clutter_timeline_do_tick() is marked as private in the header.
+  _IGNORE(clutter_timeline_do_tick)
+
   _WRAP_PROPERTY("delay", guint)
   _WRAP_PROPERTY("direction", TimelineDirection)
   _WRAP_PROPERTY("duration", guint)
-  _WRAP_PROPERTY("fps", guint)
   _WRAP_PROPERTY("loop", bool)
-  _WRAP_PROPERTY("num-frames", guint)
 
   _WRAP_SIGNAL(void completed(), "completed")
   _WRAP_SIGNAL(void new_frame(int fram_num), "new-frame")
diff --git a/clutter/src/types.ccg b/clutter/src/types.ccg
index 2e9cb07..0e8a5d2 100644
--- a/clutter/src/types.ccg
+++ b/clutter/src/types.ccg
@@ -22,24 +22,24 @@ namespace Clutter
 
 Knot::Knot(int x, int y)
 {
-  gobject_.x = x;
-  gobject_.y = y;
+  ClutterKnot tmp = {x, y};
+  gobject_ = clutter_knot_copy(&tmp);
 }
 
 void Knot::set_x(int x)
 {
-  gobject_.x = x;
+  gobject_->x = x;
 }
 
 void Knot::set_y(int y)
 {
-  gobject_.y = y;
+  gobject_->y = y;
 }
 
 void Knot::set_xy(int x, int y)
 {
-  gobject_.x = x;
-  gobject_.y = y;
+  gobject_->x = x;
+  gobject_->y = y;
 }
 
 Vertex::Vertex(float x, float y, float z)
diff --git a/clutter/src/types.hg b/clutter/src/types.hg
index 2cdcd32..df2bde4 100644
--- a/clutter/src/types.hg
+++ b/clutter/src/types.hg
@@ -49,7 +49,7 @@ _WRAP_ENUM(TextDirection, ClutterTextDirection)
 
 class Knot
 {
-  _CLASS_BOXEDTYPE_STATIC(Knot, ClutterKnot)
+  _CLASS_BOXEDTYPE(Knot, ClutterKnot, NONE, clutter_knot_copy, clutter_knot_free)
 public:
   Knot(int x, int y);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]