isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-23 03:22:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use ClutterTimeoutPool in ClutterTimeline

Browse Source 
Use a per-class timeout pool into ClutterTimeline so that every timeline
instance will use a pooled timeout function to execute the tick. This
should make multiple timelines not starve the main loop.
This commit is contained in:
Emmanuele Bassi 2007-06-09 13:20:00 +00:00
parent 7f4b6b9c0e
commit bf378bc7cd
1 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
clutter/clutter-timeline.c
View File

@ -36,6 +36,7 @@
#include "config.h" #include "config.h"
#endif #endif
#include "clutter-timeout-pool.h"
#include "clutter-timeline.h" #include "clutter-timeline.h"
#include "clutter-main.h" #include "clutter-main.h"
#include "clutter-marshal.h" #include "clutter-marshal.h"
@ -46,6 +47,8 @@ G_DEFINE_TYPE (ClutterTimeline, clutter_timeline, G_TYPE_OBJECT);
#define FPS_TO_INTERVAL(f) (1000 / (f)) #define FPS_TO_INTERVAL(f) (1000 / (f))
static ClutterTimeoutPool *timeline_pool = NULL;
struct _ClutterTimelinePrivate struct _ClutterTimelinePrivate
{ {
guint timeout_id; guint timeout_id;
@ -166,13 +169,13 @@ clutter_timeline_dispose (GObject *object)
if (priv->delay_id) if (priv->delay_id)
{ {
g_source_remove (priv->delay_id); clutter_timeout_pool_remove (timeline_pool, priv->delay_id);
priv->delay_id = 0; priv->delay_id = 0;
} }
if (priv->timeout_id) if (priv->timeout_id)
{ {
g_source_remove (priv->timeout_id); clutter_timeout_pool_remove (timeline_pool, priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
} }
@ -183,9 +186,9 @@ clutter_timeline_dispose (GObject *object)
static void static void
clutter_timeline_class_init (ClutterTimelineClass *klass) clutter_timeline_class_init (ClutterTimelineClass *klass)
{ {
GObjectClass *object_class; GObjectClass *object_class = G_OBJECT_CLASS (klass);
object_class = (GObjectClass*) klass; timeline_pool = clutter_timeout_pool_new (G_PRIORITY_DEFAULT + 30);
object_class->set_property = clutter_timeline_set_property; object_class->set_property = clutter_timeline_set_property;
object_class->get_property = clutter_timeline_get_property; object_class->get_property = clutter_timeline_get_property;
@ -399,11 +402,11 @@ delay_timeout_func (gpointer data)
priv->delay_id = 0; priv->delay_id = 0;
priv->timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT + 20, priv->timeout_id = clutter_timeout_pool_add (timeline_pool,
FPS_TO_INTERVAL (priv->fps), FPS_TO_INTERVAL (priv->fps),
timeline_timeout_func, timeline_timeout_func,
timeline, timeline,
NULL); NULL);
g_signal_emit (timeline, timeline_signals[STARTED], 0); g_signal_emit (timeline, timeline_signals[STARTED], 0);
@ -430,19 +433,20 @@ clutter_timeline_start (ClutterTimeline *timeline)
if (priv->delay) if (priv->delay)
{ {
priv->delay_id = g_timeout_add_full (G_PRIORITY_DEFAULT + 20, priv->delay_id = clutter_timeout_pool_add (timeline_pool,
priv->delay, priv->delay,
delay_timeout_func, delay_timeout_func,
timeline, timeline,
NULL); NULL);
} }
else else
{ {
priv->timeout_id = g_timeout_add_full (G_PRIORITY_DEFAULT + 20, priv->timeout_id = clutter_timeout_pool_add (timeline_pool,
FPS_TO_INTERVAL (priv->fps), FPS_TO_INTERVAL (priv->fps),
timeline_timeout_func, timeline_timeout_func,
timeline, timeline,
NULL); NULL);
g_signal_emit (timeline, timeline_signals[STARTED], 0); g_signal_emit (timeline, timeline_signals[STARTED], 0);
} }
} }
@ -464,13 +468,13 @@ clutter_timeline_pause (ClutterTimeline *timeline)
if (priv->delay_id) if (priv->delay_id)
{ {
g_source_remove (priv->delay_id); clutter_timeout_pool_remove (timeline_pool, priv->delay_id);
priv->delay_id = 0; priv->delay_id = 0;
} }
if (priv->timeout_id) if (priv->timeout_id)
{ {
g_source_remove (priv->timeout_id); clutter_timeout_pool_remove (timeline_pool, priv->timeout_id);
priv->timeout_id = 0; priv->timeout_id = 0;
} }
@ -674,11 +678,12 @@ clutter_timeline_set_speed (ClutterTimeline *timeline,
/* if the timeline is playing restart */ /* if the timeline is playing restart */
if (priv->timeout_id) if (priv->timeout_id)
{ {
g_source_remove (priv->timeout_id); clutter_timeout_pool_remove (timeline_pool, priv->timeout_id);
priv->timeout_id = g_timeout_add (FPS_TO_INTERVAL (priv->fps), priv->timeout_id = clutter_timeout_pool_add (timeline_pool,
timeline_timeout_func, FPS_TO_INTERVAL (priv->fps),
timeline); timeline_timeout_func,
timeline, NULL);
} }
g_object_notify (G_OBJECT (timeline), "fps"); g_object_notify (G_OBJECT (timeline), "fps");