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

clutter/timeline: Add helpers to remove/add timeline to some frame clock

Browse Source 
Either the master clock or assigned frame clock.

https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/1285
This commit is contained in:
Jonas Ådahl 2020-03-25 19:18:00 +01:00
parent a0d87662f7
commit f31a7acab5
1 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
clutter/clutter/clutter-timeline.c
View File

@ -512,6 +512,42 @@ clutter_timeline_get_property (GObject *object,
}
}
static void
add_timeline (ClutterTimeline *timeline)
{
ClutterTimelinePrivate *priv = timeline->priv;
if (priv->frame_clock)
{
clutter_frame_clock_add_timeline (priv->frame_clock, timeline);
}
else
{
ClutterMasterClock *master_clock;
master_clock = _clutter_master_clock_get_default ();
_clutter_master_clock_add_timeline (master_clock, timeline);
}
}
static void
remove_timeline (ClutterTimeline *timeline)
{
ClutterTimelinePrivate *priv = timeline->priv;
if (priv->frame_clock)
{
clutter_frame_clock_remove_timeline (priv->frame_clock, timeline);
}
else
{
ClutterMasterClock *master_clock;
master_clock = _clutter_master_clock_get_default ();
_clutter_master_clock_remove_timeline (master_clock, timeline);
}
}
static void
clutter_timeline_finalize (GObject *object)
{
@ -522,19 +558,7 @@ clutter_timeline_finalize (GObject *object)
g_hash_table_destroy (priv->markers_by_name);
if (priv->is_playing)
{
if (priv->frame_clock)
{
clutter_frame_clock_remove_timeline (priv->frame_clock, self);
}
else
{
ClutterMasterClock *master_clock;
master_clock = _clutter_master_clock_get_default ();
_clutter_master_clock_remove_timeline (master_clock, self);
}
}
remove_timeline (self);
g_clear_object (&priv->frame_clock);
@ -971,24 +995,12 @@ set_is_playing (ClutterTimeline *timeline,
{
priv->waiting_first_tick = TRUE;
priv->current_repeat = 0;
}
if (priv->frame_clock)
{
if (priv->is_playing)
clutter_frame_clock_add_timeline (priv->frame_clock, timeline);
else
clutter_frame_clock_remove_timeline (priv->frame_clock, timeline);
add_timeline (timeline);
}
else
{
ClutterMasterClock *master_clock;
master_clock = _clutter_master_clock_get_default ();
if (priv->is_playing)
_clutter_master_clock_add_timeline (master_clock, timeline);
else
_clutter_master_clock_remove_timeline (master_clock, timeline);
remove_timeline (timeline);
}
}