diff options
author | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-03-09 17:05:13 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2009-03-10 12:38:03 +0000 |
commit | 720341b3018dfa2698642c4266a399c035a9ff24 (patch) | |
tree | ff08880874231b82a0f693eabbf2b05728c6fe89 /clutter/clutter-timeline.h | |
parent | 849e916d6fc568286223cab015ee1d3c0a1cb592 (diff) | |
download | clutter-720341b3018dfa2698642c4266a399c035a9ff24.tar.gz |
Move ClutterTimeline to CoglFixed
The ClutterTimeline::get_progressx() method should return a
CoglFixed, now that ClutterFixed is being deprecated.
Diffstat (limited to 'clutter/clutter-timeline.h')
-rw-r--r-- | clutter/clutter-timeline.h | 29 |
1 files changed, 7 insertions, 22 deletions
diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h index 948c64194..6483d7b57 100644 --- a/clutter/clutter-timeline.h +++ b/clutter/clutter-timeline.h @@ -33,27 +33,12 @@ G_BEGIN_DECLS -#define CLUTTER_TYPE_TIMELINE (clutter_timeline_get_type ()) - -#define CLUTTER_TIMELINE(obj) \ - (G_TYPE_CHECK_INSTANCE_CAST ((obj), \ - CLUTTER_TYPE_TIMELINE, ClutterTimeline)) - -#define CLUTTER_TIMELINE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST ((klass), \ - CLUTTER_TYPE_TIMELINE, ClutterTimelineClass)) - -#define CLUTTER_IS_TIMELINE(obj) \ - (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \ - CLUTTER_TYPE_TIMELINE)) - -#define CLUTTER_IS_TIMELINE_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_TYPE ((klass), \ - CLUTTER_TYPE_TIMELINE)) - -#define CLUTTER_TIMELINE_GET_CLASS(obj) \ - (G_TYPE_INSTANCE_GET_CLASS ((obj), \ - CLUTTER_TYPE_TIMELINE, ClutterTimelineClass)) +#define CLUTTER_TYPE_TIMELINE (clutter_timeline_get_type ()) +#define CLUTTER_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), CLUTTER_TYPE_TIMELINE, ClutterTimeline)) +#define CLUTTER_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), CLUTTER_TYPE_TIMELINE, ClutterTimelineClass)) +#define CLUTTER_IS_TIMELINE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CLUTTER_TYPE_TIMELINE)) +#define CLUTTER_IS_TIMELINE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CLUTTER_TYPE_TIMELINE)) +#define CLUTTER_TIMELINE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), CLUTTER_TYPE_TIMELINE, ClutterTimelineClass)) /** * ClutterTimelineDirection: @@ -134,7 +119,7 @@ void clutter_timeline_advance (ClutterTimeline *timeli guint frame_num); gint clutter_timeline_get_current_frame (ClutterTimeline *timeline); gdouble clutter_timeline_get_progress (ClutterTimeline *timeline); -ClutterFixed clutter_timeline_get_progressx (ClutterTimeline *timeline); +CoglFixed clutter_timeline_get_progressx (ClutterTimeline *timeline); void clutter_timeline_set_n_frames (ClutterTimeline *timeline, guint n_frames); guint clutter_timeline_get_n_frames (ClutterTimeline *timeline); |