isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

ClutterTimeline: Fix the 'msecs' parameter for the new-frame signal

Browse Source 
Between Clutter 0.8 and 1.0, the new-frame signal of ClutterTimeline
changed the second parameter to be an elapsed time in milliseconds
rather than the frame number. However a few places in clutter were
still calling the parameter 'frame_num' which is a bit
misleading. Notably the signature for the signal class closure in the
header was using the wrong name. This changes them to use 'msecs'.
This commit is contained in:
Neil Roberts 2011-01-24 11:49:04 +00:00
parent 5c0aaf50a7
commit e8d5be0ba7
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-alpha.c
View File

@ -149,7 +149,7 @@ static GParamSpec *obj_props[PROP_LAST];
static void static void
timeline_new_frame_cb (ClutterTimeline *timeline, timeline_new_frame_cb (ClutterTimeline *timeline,
guint current_frame_num, guint msecs,
ClutterAlpha *alpha) ClutterAlpha *alpha)
{ {
ClutterAlphaPrivate *priv = alpha->priv; ClutterAlphaPrivate *priv = alpha->priv;

2
clutter/clutter-timeline.h
View File

@ -96,7 +96,7 @@ struct _ClutterTimelineClass
void (*paused) (ClutterTimeline *timeline); void (*paused) (ClutterTimeline *timeline);
void (*new_frame) (ClutterTimeline *timeline, void (*new_frame) (ClutterTimeline *timeline,
gint frame_num); gint msecs);
void (*marker_reached) (ClutterTimeline *timeline, void (*marker_reached) (ClutterTimeline *timeline,
const gchar *marker_name, const gchar *marker_name,

4
tests/conform/test-timeline-rewind.c
View File

@ -35,11 +35,9 @@ watchdog_timeout (TestState *state)
static void static void
new_frame_cb (ClutterTimeline *timeline, new_frame_cb (ClutterTimeline *timeline,
gint frame_num, gint elapsed_time,
TestState *state) TestState *state)
{ {
gint elapsed_time = clutter_timeline_get_elapsed_time (timeline);
if (elapsed_time == TEST_TIMELINE_DURATION) if (elapsed_time == TEST_TIMELINE_DURATION)
{ {
g_test_message ("new-frame signal received (end of timeline)"); g_test_message ("new-frame signal received (end of timeline)");