isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 18:11:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

2007-08-08 Emmanuele Bassi <ebassi@openedhand.com>

Browse Source 
* clutter/clutter-main.c (clutter_get_timestamp): Return the
	correct number of microseconds (#447, Neil Roberts)
This commit is contained in:
Emmanuele Bassi 2007-08-08 11:22:45 +00:00
parent 8e6bb196d5
commit 1639b7d0b8
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2007-08-08 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-main.c (clutter_get_timestamp): Return the
correct number of microseconds (#447, Neil Roberts)
2007-08-08 Emmanuele Bassi <ebassi@openedhand.com> 2007-08-08 Emmanuele Bassi <ebassi@openedhand.com>
Merge the clutter.git/threading branch. Merge the clutter.git/threading branch.

7
clutter/clutter-main.c
View File

@ -670,14 +670,15 @@ clutter_get_timestamp (void)
{ {
#ifdef CLUTTER_ENABLE_DEBUG #ifdef CLUTTER_ENABLE_DEBUG
ClutterMainContext *ctx; ClutterMainContext *ctx;
gdouble seconds; gdouble seconds;
gulong msecs;
ctx = clutter_context_get_default (); ctx = clutter_context_get_default ();
/* FIXME: may need a custom timer for embedded setups */ /* FIXME: may need a custom timer for embedded setups */
seconds = g_timer_elapsed (ctx->timer, NULL); seconds = g_timer_elapsed (ctx->timer, &msecs);
return (gulong)(seconds / 0.0000001); return (gulong)(seconds / 1.0e-6) + msecs;
#else #else
return 0; return 0;
#endif #endif