From e97cba0162f2318e4e9bf0e3971997227da893fd Mon Sep 17 00:00:00 2001 From: Neil Roberts Date: Fri, 18 Apr 2008 13:51:16 +0000 Subject: [PATCH] * clutter/clutter-timeline.c (clutter_timeline_get_progressx): Changed to use clutter_qdiv instead of CLUTTER_FIXED_DIV otherwise it can't cope with timelines with more than 255 frames. --- ChangeLog | 6 ++++++ clutter/clutter-timeline.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index f5205db5b..2087b63db 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-04-18 Neil Roberts + + * clutter/clutter-timeline.c (clutter_timeline_get_progressx): + Changed to use clutter_qdiv instead of CLUTTER_FIXED_DIV otherwise + it can't cope with timelines with more than 255 frames. + 2008-04-17 Emmanuele Bassi * clutter/clutter-frame-source.c: Small coding style fixes. diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index 0777797d5..382fce0e2 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -1310,8 +1310,8 @@ clutter_timeline_get_progressx (ClutterTimeline *timeline) priv = timeline->priv; - progress = CLUTTER_FIXED_DIV (CLUTTER_INT_TO_FIXED (priv->current_frame_num), - CLUTTER_INT_TO_FIXED (priv->n_frames)); + progress = clutter_qdivx (CLUTTER_INT_TO_FIXED (priv->current_frame_num), + CLUTTER_INT_TO_FIXED (priv->n_frames)); if (priv->direction == CLUTTER_TIMELINE_BACKWARD) progress = CFX_ONE - progress;