From 976df38630a96702bc69bc25128f652d1e50b152 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Mon, 19 Nov 2007 15:25:56 +0000 Subject: [PATCH] 2007-11-19 Emmanuele Bassi * clutter/clutter-timeline.c (timeline_timeout_func): Do not emit the ::new-frame signal twice for the last frame. (#531) --- ChangeLog | 5 +++++ clutter/clutter-timeline.c | 23 ++++++++++++----------- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index d047f8073..e7547bfe2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-19 Emmanuele Bassi + + * clutter/clutter-timeline.c (timeline_timeout_func): Do not emit the + ::new-frame signal twice for the last frame. (#531) + 2007-11-19 Øyvind Kolås * clutter/clutter-actor.[ch]: (clutter_actor_set_rotationx), diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index 88dd49fda..7bf348073 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -537,30 +537,31 @@ timeline_timeout_func (gpointer data) ((priv->direction == CLUTTER_TIMELINE_BACKWARD) && (priv->current_frame_num < 0))) { - guint frame_diff; - - CLUTTER_NOTE (SCHEDULER, - "Timeline [%p] completed (cur: %d, tot: %d, drop: %d)", - timeline, - priv->current_frame_num, - priv->n_frames, - n_frames - 1); + 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 + else if (priv->direction == CLUTTER_TIMELINE_BACKWARD) { - frame_diff = priv->n_frames - priv->current_frame_num; + 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, + priv->current_frame_num, + priv->n_frames, + n_frames - 1, + frame_diff); + /* 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) + if (frame_diff > 1) { g_signal_emit (timeline, timeline_signals[NEW_FRAME], 0, priv->current_frame_num);