summaryrefslogtreecommitdiff
path: root/clutter/clutter-timeline.c
diff options
context:
space:
mode:
authorEmmanuele Bassi <ebassi@linux.intel.com>2009-01-27 10:31:53 +0000
committerEmmanuele Bassi <ebassi@linux.intel.com>2009-01-27 10:31:53 +0000
commit7863ca4a5549cf2fccc5ded8854b0b8156b5d323 (patch)
treeb28d6afa562a9551ea830e7e783c7486a04116bf /clutter/clutter-timeline.c
parent2be9cdc267f7e7d7190f8e1056e7c717f9358626 (diff)
downloadclutter-7863ca4a5549cf2fccc5ded8854b0b8156b5d323.tar.gz
[timeline] Whitespace fixes
Diffstat (limited to 'clutter/clutter-timeline.c')
-rw-r--r--clutter/clutter-timeline.c29
1 files changed, 21 insertions, 8 deletions
diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c
index 2f4e42cc6..ea994ea8c 100644
--- a/clutter/clutter-timeline.c
+++ b/clutter/clutter-timeline.c
@@ -111,7 +111,7 @@ struct _ClutterTimelinePrivate
gint skipped_frames;
GTimeVal prev_frame_timeval;
- guint msecs_delta;
+ guint msecs_delta;
GHashTable *markers_by_frame;
GHashTable *markers_by_name;
@@ -148,9 +148,9 @@ enum
LAST_SIGNAL
};
-static guint timeline_signals[LAST_SIGNAL] = { 0 };
-static gint timeline_use_pool = -1;
-static ClutterTimeoutPool *timeline_pool = NULL;
+static guint timeline_signals[LAST_SIGNAL] = { 0, };
+static gint timeline_use_pool = -1;
+static ClutterTimeoutPool *timeline_pool = NULL;
static inline void
timeline_pool_init (void)
@@ -254,21 +254,27 @@ clutter_timeline_set_property (GObject *object,
case PROP_FPS:
clutter_timeline_set_speed (timeline, g_value_get_uint (value));
break;
+
case PROP_NUM_FRAMES:
clutter_timeline_set_n_frames (timeline, g_value_get_uint (value));
break;
+
case PROP_LOOP:
priv->loop = g_value_get_boolean (value);
break;
+
case PROP_DELAY:
priv->delay = g_value_get_uint (value);
break;
+
case PROP_DURATION:
clutter_timeline_set_duration (timeline, g_value_get_uint (value));
break;
+
case PROP_DIRECTION:
clutter_timeline_set_direction (timeline, g_value_get_enum (value));
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -292,21 +298,27 @@ clutter_timeline_get_property (GObject *object,
case PROP_FPS:
g_value_set_uint (value, priv->fps);
break;
+
case PROP_NUM_FRAMES:
g_value_set_uint (value, priv->n_frames);
break;
+
case PROP_LOOP:
g_value_set_boolean (value, priv->loop);
break;
+
case PROP_DELAY:
g_value_set_uint (value, priv->delay);
break;
+
case PROP_DURATION:
g_value_set_uint (value, clutter_timeline_get_duration (timeline));
break;
+
case PROP_DIRECTION:
g_value_set_enum (value, priv->direction);
break;
+
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
@@ -796,10 +808,10 @@ timeline_timeout_func (gpointer data)
static guint
timeline_timeout_add (ClutterTimeline *timeline,
- guint interval,
- GSourceFunc func,
- gpointer data,
- GDestroyNotify notify)
+ guint interval,
+ GSourceFunc func,
+ gpointer data,
+ GDestroyNotify notify)
{
ClutterTimelinePrivate *priv;
GTimeVal timeval;
@@ -811,6 +823,7 @@ timeline_timeout_add (ClutterTimeline *timeline,
g_get_current_time (&timeval);
priv->prev_frame_timeval = timeval;
}
+
priv->skipped_frames = 0;
priv->msecs_delta = 0;