brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Intern clutter_get_actor_by_gid() implementation

Browse Source 
As the prelude to deprecation of the function in 1.8, let's move the
implementation to an internal function, and use that instead of the
public facing one.
This commit is contained in:
Emmanuele Bassi 2011-02-09 14:53:20 +00:00
parent 03358aca6c
commit 95f6359f64
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
clutter/clutter-main.c
View File

@ -334,7 +334,15 @@ clutter_get_motion_events_enabled (void)
return context->motion_events_per_actor; return context->motion_events_per_actor;
} }
guint _clutter_pix_to_id (guchar pixel[4]); static inline ClutterActor *
_clutter_actor_get_by_id (guint32 id)
{
ClutterMainContext *context = _clutter_context_get_default ();
g_assert (context->id_pool != NULL);
return clutter_id_pool_lookup (context->id_pool, id);
}
void void
_clutter_id_to_color (guint id, ClutterColor *col) _clutter_id_to_color (guint id, ClutterColor *col)
@ -599,7 +607,7 @@ _clutter_do_pick (ClutterStage *stage,
} }
id = _clutter_pixel_to_id (pixel); id = _clutter_pixel_to_id (pixel);
actor = clutter_get_actor_by_gid (id); actor = _clutter_actor_get_by_id (id);
goto result; goto result;
} }
@ -691,7 +699,7 @@ _clutter_do_pick (ClutterStage *stage,
} }
id = _clutter_pixel_to_id (pixel); id = _clutter_pixel_to_id (pixel);
actor = clutter_get_actor_by_gid (id); actor = _clutter_actor_get_by_id (id);
result: result:
@ -2555,7 +2563,6 @@ _clutter_process_event (ClutterEvent *event)
context->current_event = NULL; context->current_event = NULL;
} }
/** /**
* clutter_get_actor_by_gid: * clutter_get_actor_by_gid:
* @id: a #ClutterActor ID. * @id: a #ClutterActor ID.
@ -2570,13 +2577,7 @@ _clutter_process_event (ClutterEvent *event)
ClutterActor * ClutterActor *
clutter_get_actor_by_gid (guint32 id) clutter_get_actor_by_gid (guint32 id)
{ {
ClutterMainContext *context; return _clutter_actor_get_by_id (id);
context = _clutter_context_get_default ();
g_return_val_if_fail (context != NULL, NULL);
return CLUTTER_ACTOR (clutter_id_pool_lookup (context->id_pool, id));
} }
void void

3
clutter/clutter-private.h
View File

@ -214,7 +214,8 @@ void _clutter_do_redraw (ClutterStage *stage);
guint _clutter_pixel_to_id (guchar pixel[4]); guint _clutter_pixel_to_id (guchar pixel[4]);
void _clutter_id_to_color (guint id, ClutterColor *col); void _clutter_id_to_color (guint id,
ClutterColor *col);
/* use this function as the accumulator if you have a signal with /* use this function as the accumulator if you have a signal with
* a G_TYPE_BOOLEAN return value; this will stop the emission as * a G_TYPE_BOOLEAN return value; this will stop the emission as