From 6c471cb7e1f8a8c50120cb9ccda2e2a52fc59b01 Mon Sep 17 00:00:00 2001 From: Matthew Allum Date: Thu, 1 Jun 2006 21:37:28 +0000 Subject: [PATCH] 2006-06-01 Matthew Allum * clutter/clutter-element.c: Fix a snafu in clutter_element_raise () * clutter/clutter-timeline.c: * clutter/clutter-timeline.h: Add new clutter_timeline_is_playing() method --- ChangeLog | 9 +++++++++ clutter/clutter-element.c | 7 +++---- clutter/clutter-timeline.c | 15 +++++++++++++++ clutter/clutter-timeline.h | 3 +++ 4 files changed, 30 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 37056d1..3a8cfa3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-06-01 Matthew Allum + + * clutter/clutter-element.c: + Fix a snafu in clutter_element_raise () + + * clutter/clutter-timeline.c: + * clutter/clutter-timeline.h: + Add new clutter_timeline_is_playing() method + 2006-05-29 Matthew Allum * clutter/clutter-color.c: (clutter_color_set): diff --git a/clutter/clutter-element.c b/clutter/clutter-element.c index c8be3ea..9e00149 100644 --- a/clutter/clutter-element.c +++ b/clutter/clutter-element.c @@ -1170,13 +1170,12 @@ clutter_element_get_parent (ClutterElement *self) void clutter_element_raise (ClutterElement *self, ClutterElement *below) { + g_return_if_fail (CLUTTER_IS_ELEMENT(self)); g_return_if_fail (clutter_element_get_parent (self) != NULL); - g_return_if_fail - (clutter_element_get_parent (self) != clutter_element_get_parent (below)); clutter_group_raise (CLUTTER_GROUP(clutter_element_get_parent (self)), - self, - below); + self, + below); } /** diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index bcbf03f..c8f9134 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -463,6 +463,21 @@ clutter_timeline_set_speed (ClutterTimeline *timeline, guint fps) } /** + * clutter_timeline_is_playing: + * @timeline: A #ClutterTimeline + * + * Query state of a #ClutterTimeline instance. + * + * Return Value: TRUE if timeline is currently playing, FALSE if not. + */ +gboolean +clutter_timeline_is_playing (ClutterTimeline *timeline) +{ + return (timeline->priv->timeout_id != 0); +} + + +/** * clutter_timeline_new: * @nframes: #ClutterTimeline number of frames * @fps: #ClutterTimeline frames per second diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h index 9604323..f916773 100644 --- a/clutter/clutter-timeline.h +++ b/clutter/clutter-timeline.h @@ -107,6 +107,9 @@ clutter_timeline_get_current_frame (ClutterTimeline *timeline); guint clutter_timeline_get_n_frames (ClutterTimeline *timeline); +gboolean +clutter_timeline_is_playing (ClutterTimeline *timeline); + G_END_DECLS #endif -- 2.7.4