From dd185940c0bfa1cd12f3106fed8a695f2e9cbae4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Wed, 25 Jun 2008 16:46:42 +0000 Subject: [PATCH] 2008-06-25 Emmanuele Bassi * clutter/clutter-main.h: Make the priority constants public. * clutter/clutter-stage.c: Use CLUTTER_PRIORITY_REDRAW. * clutter/clutter-timeline.c: Use CLUTTER_PRIORITY_TIMELINE. --- ChangeLog | 8 ++++++++ clutter/clutter-main.h | 23 +++++++++++++++++++++++ clutter/clutter-stage.c | 2 +- clutter/clutter-timeline.c | 5 ++--- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee283ef9b..6a59f4045 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-25 Emmanuele Bassi + + * clutter/clutter-main.h: Make the priority constants public. + + * clutter/clutter-stage.c: Use CLUTTER_PRIORITY_REDRAW. + + * clutter/clutter-timeline.c: Use CLUTTER_PRIORITY_TIMELINE. + 2008-06-25 Emmanuele Bassi * clutter/osx/clutter-backend-osx.c: diff --git a/clutter/clutter-main.h b/clutter/clutter-main.h index 5bead3305..d2eef79d0 100644 --- a/clutter/clutter-main.h +++ b/clutter/clutter-main.h @@ -31,6 +31,11 @@ G_BEGIN_DECLS +/** + * CLUTTER_INIT_ERROR: + * + * #GError domain for #ClutterInitError + */ #define CLUTTER_INIT_ERROR (clutter_init_error_quark ()) /** @@ -55,6 +60,24 @@ typedef enum { GQuark clutter_init_error_quark (void); +/** + * CLUTTER_PRIORITY_REDRAW: + * + * Priority of the redraws. + * + * Since: 0.8 + */ +#define CLUTTER_PRIORITY_REDRAW (G_PRIORITY_DEFAULT + 10) + +/** + * CLUTTER_PRIORITY_TIMELINE: + * + * Priority of the timelines. + * + * Since: 0.8 + */ +#define CLUTTER_PRIORITY_TIMELINE (G_PRIORITY_DEFAULT + 30) + /* Initialisation */ void clutter_base_init (void); ClutterInitError clutter_init (int *argc, diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 51163213b..ab49ab041 100644 --- a/clutter/clutter-stage.c +++ b/clutter/clutter-stage.c @@ -1804,7 +1804,7 @@ clutter_stage_queue_redraw (ClutterStage *stage) /* FIXME: weak_ref self in case we dissapear before paint? */ stage->priv->update_idle = - clutter_threads_add_idle_full (G_PRIORITY_DEFAULT + 10, + clutter_threads_add_idle_full (CLUTTER_PRIORITY_REDRAW, redraw_update_idle, stage, NULL); diff --git a/clutter/clutter-timeline.c b/clutter/clutter-timeline.c index a575b2fc6..64f8a0591 100644 --- a/clutter/clutter-timeline.c +++ b/clutter/clutter-timeline.c @@ -94,7 +94,6 @@ G_DEFINE_TYPE (ClutterTimeline, clutter_timeline, G_TYPE_OBJECT); #define FPS_TO_INTERVAL(f) (1000 / (f)) -#define CLUTTER_TIMELINE_PRIORITY (G_PRIORITY_DEFAULT + 30) struct _ClutterTimelinePrivate { @@ -169,7 +168,7 @@ timeline_pool_init (void) } else { - timeline_pool = clutter_timeout_pool_new (CLUTTER_TIMELINE_PRIORITY); + timeline_pool = clutter_timeout_pool_new (CLUTTER_PRIORITY_TIMELINE); timeline_use_pool = TRUE; } } @@ -192,7 +191,7 @@ timeout_add (guint interval, } else { - res = clutter_threads_add_frame_source_full (CLUTTER_TIMELINE_PRIORITY, + res = clutter_threads_add_frame_source_full (CLUTTER_PRIORITY_TIMELINE, interval, func, data, notify); }