[clutter] Clean up clutter-timeline.h
- From: Emmanuele Bassi <ebassi src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [clutter] Clean up clutter-timeline.h
- Date: Mon, 13 Feb 2012 18:25:21 +0000 (UTC)
commit bc2e4ac6c2ebdf00996f472f6583b582c5250a94
Author: Emmanuele Bassi <ebassi linux intel com>
Date: Mon Feb 13 13:39:47 2012 +0000
Clean up clutter-timeline.h
Re-align everything to allow expansion, and move the only "protected"
function to the clutter-master-clock.h private header.
clutter/clutter-master-clock.h | 20 +++++----
clutter/clutter-timeline.h | 90 +++++++++++++++++++---------------------
2 files changed, 54 insertions(+), 56 deletions(-)
---
diff --git a/clutter/clutter-master-clock.h b/clutter/clutter-master-clock.h
index 60026e3..75213af 100644
--- a/clutter/clutter-master-clock.h
+++ b/clutter/clutter-master-clock.h
@@ -36,15 +36,17 @@ typedef struct _ClutterMasterClock ClutterMasterClock;
GType _clutter_master_clock_get_type (void) G_GNUC_CONST;
-ClutterMasterClock *_clutter_master_clock_get_default (void);
-void _clutter_master_clock_add_timeline (ClutterMasterClock *master_clock,
- ClutterTimeline *timeline);
-void _clutter_master_clock_remove_timeline (ClutterMasterClock *master_clock,
- ClutterTimeline *timeline);
-void _clutter_master_clock_advance (ClutterMasterClock *master_clock);
-void _clutter_master_clock_start_running (ClutterMasterClock *master_clock);
-void _clutter_master_clock_ensure_next_iteration (ClutterMasterClock *master_clock);
-
+ClutterMasterClock * _clutter_master_clock_get_default (void);
+void _clutter_master_clock_add_timeline (ClutterMasterClock *master_clock,
+ ClutterTimeline *timeline);
+void _clutter_master_clock_remove_timeline (ClutterMasterClock *master_clock,
+ ClutterTimeline *timeline);
+void _clutter_master_clock_advance (ClutterMasterClock *master_clock);
+void _clutter_master_clock_start_running (ClutterMasterClock *master_clock);
+void _clutter_master_clock_ensure_next_iteration (ClutterMasterClock *master_clock);
+
+void _clutter_timeline_do_tick (ClutterTimeline *timeline,
+ gint64 tick_time);
G_END_DECLS
diff --git a/clutter/clutter-timeline.h b/clutter/clutter-timeline.h
index ce642f3..b0272de 100644
--- a/clutter/clutter-timeline.h
+++ b/clutter/clutter-timeline.h
@@ -96,53 +96,49 @@ struct _ClutterTimelineClass
GType clutter_timeline_get_type (void) G_GNUC_CONST;
-ClutterTimeline *clutter_timeline_new (guint msecs);
-ClutterTimeline *clutter_timeline_clone (ClutterTimeline *timeline);
-
-guint clutter_timeline_get_duration (ClutterTimeline *timeline);
-void clutter_timeline_set_duration (ClutterTimeline *timeline,
- guint msecs);
-ClutterTimelineDirection clutter_timeline_get_direction (ClutterTimeline *timeline);
-void clutter_timeline_set_direction (ClutterTimeline *timeline,
- ClutterTimelineDirection direction);
-void clutter_timeline_start (ClutterTimeline *timeline);
-void clutter_timeline_pause (ClutterTimeline *timeline);
-void clutter_timeline_stop (ClutterTimeline *timeline);
-void clutter_timeline_set_loop (ClutterTimeline *timeline,
- gboolean loop);
-gboolean clutter_timeline_get_loop (ClutterTimeline *timeline);
-void clutter_timeline_set_auto_reverse (ClutterTimeline *timeline,
- gboolean reverse);
-gboolean clutter_timeline_get_auto_reverse (ClutterTimeline *timeline);
-void clutter_timeline_rewind (ClutterTimeline *timeline);
-void clutter_timeline_skip (ClutterTimeline *timeline,
- guint msecs);
-void clutter_timeline_advance (ClutterTimeline *timeline,
- guint msecs);
-guint clutter_timeline_get_elapsed_time (ClutterTimeline *timeline);
-gdouble clutter_timeline_get_progress (ClutterTimeline *timeline);
-gboolean clutter_timeline_is_playing (ClutterTimeline *timeline);
-void clutter_timeline_set_delay (ClutterTimeline *timeline,
- guint msecs);
-guint clutter_timeline_get_delay (ClutterTimeline *timeline);
-guint clutter_timeline_get_delta (ClutterTimeline *timeline);
-
-void clutter_timeline_add_marker_at_time (ClutterTimeline *timeline,
- const gchar *marker_name,
- guint msecs);
-void clutter_timeline_remove_marker (ClutterTimeline *timeline,
- const gchar *marker_name);
-gchar ** clutter_timeline_list_markers (ClutterTimeline *timeline,
- gint msecs,
- gsize *n_markers) G_GNUC_MALLOC;
-gboolean clutter_timeline_has_marker (ClutterTimeline *timeline,
- const gchar *marker_name);
-void clutter_timeline_advance_to_marker (ClutterTimeline *timeline,
- const gchar *marker_name);
-
-/*< private >*/
-void _clutter_timeline_do_tick (ClutterTimeline *timeline,
- gint64 tick_time);
+ClutterTimeline * clutter_timeline_new (guint msecs);
+
+guint clutter_timeline_get_duration (ClutterTimeline *timeline);
+void clutter_timeline_set_duration (ClutterTimeline *timeline,
+ guint msecs);
+ClutterTimelineDirection clutter_timeline_get_direction (ClutterTimeline *timeline);
+void clutter_timeline_set_direction (ClutterTimeline *timeline,
+ ClutterTimelineDirection direction);
+void clutter_timeline_start (ClutterTimeline *timeline);
+void clutter_timeline_pause (ClutterTimeline *timeline);
+void clutter_timeline_stop (ClutterTimeline *timeline);
+void clutter_timeline_set_loop (ClutterTimeline *timeline,
+ gboolean loop);
+gboolean clutter_timeline_get_loop (ClutterTimeline *timeline);
+void clutter_timeline_set_auto_reverse (ClutterTimeline *timeline,
+ gboolean reverse);
+gboolean clutter_timeline_get_auto_reverse (ClutterTimeline *timeline);
+void clutter_timeline_rewind (ClutterTimeline *timeline);
+void clutter_timeline_skip (ClutterTimeline *timeline,
+ guint msecs);
+void clutter_timeline_advance (ClutterTimeline *timeline,
+ guint msecs);
+guint clutter_timeline_get_elapsed_time (ClutterTimeline *timeline);
+gdouble clutter_timeline_get_progress (ClutterTimeline *timeline);
+gboolean clutter_timeline_is_playing (ClutterTimeline *timeline);
+void clutter_timeline_set_delay (ClutterTimeline *timeline,
+ guint msecs);
+guint clutter_timeline_get_delay (ClutterTimeline *timeline);
+guint clutter_timeline_get_delta (ClutterTimeline *timeline);
+void clutter_timeline_add_marker_at_time (ClutterTimeline *timeline,
+ const gchar *marker_name,
+ guint msecs);
+void clutter_timeline_remove_marker (ClutterTimeline *timeline,
+ const gchar *marker_name);
+gchar ** clutter_timeline_list_markers (ClutterTimeline *timeline,
+ gint msecs,
+ gsize *n_markers) G_GNUC_MALLOC;
+gboolean clutter_timeline_has_marker (ClutterTimeline *timeline,
+ const gchar *marker_name);
+void clutter_timeline_advance_to_marker (ClutterTimeline *timeline,
+ const gchar *marker_name);
+
+ClutterTimeline * clutter_timeline_clone (ClutterTimeline *timeline);
G_END_DECLS
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
