From eba76123886addfed06e5c140b80a12c18ccfac9 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 14 Jan 2008 12:02:28 +0000 Subject: [PATCH] 2008-01-14 Emmanuele Bassi * clutter/clutter-timeline.c (timeline_timeout_func): Fix check if the last frame was reached by skipping a frame (#654, Johan Bilien) --- ChangeLog | 6 ++++++ clutter/clutter-timeline.c | 11 +++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4594e4e..e235998 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2008-01-14 Emmanuele Bassi + * clutter/clutter-timeline.c (timeline_timeout_func): Fix + check if the last frame was reached by skipping a frame (#654, + Johan Bilien) + +2008-01-14 Emmanuele Bassi + * clutter/clutter-shader.c: Use correct format string for gssize. (#695, Tommi Komulainen) diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index 4352bea..da998ea 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -551,31 +551,26 @@ timeline_timeout_func (gpointer data) ((priv->direction == CLUTTER_TIMELINE_BACKWARD) && (priv->current_frame_num < 0))) { - guint frame_diff = 0; - if (priv->direction == CLUTTER_TIMELINE_FORWARD) { - frame_diff = priv->current_frame_num - priv->n_frames; priv->current_frame_num = priv->n_frames; } else if (priv->direction == CLUTTER_TIMELINE_BACKWARD) { - frame_diff = priv->current_frame_num * -1; priv->current_frame_num = 0; } CLUTTER_NOTE (SCHEDULER, - "Timeline [%p] completed (cur: %d, tot: %d, drop: %d, diff: %d)", + "Timeline [%p] completed (cur: %d, tot: %d, drop: %d)", timeline, priv->current_frame_num, priv->n_frames, - n_frames - 1, - frame_diff); + n_frames - 1); /* if we skipped some frame to get here let's see whether we still need * to emit the last new-frame signal with the last frame */ - if (frame_diff > 1) + if (n_frames > 1) { g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0, priv->current_frame_num); -- 2.7.4