diff options
| author | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2019-08-14 02:02:12 +0300 |
|---|---|---|
| committer | Alberts Muktupāvels <alberts.muktupavels@gmail.com> | 2019-08-14 02:02:12 +0300 |
| commit | 82f741eb3ef2f65b882a1e8f813ca6ef6de4cf9f (patch) | |
| tree | 7548e909fea7c260236955abb5e2008e06e0da0b | |
| parent | 16538110febf3a9c9a68d084df2e57c26c4630c6 (diff) | |
| download | metacity-82f741eb3ef2f65b882a1e8f813ca6ef6de4cf9f.tar.gz | |
effects: avoid deprecated g_get_current_time
| -rw-r--r-- | src/core/effects.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/effects.c b/src/core/effects.c index da42a11e..5b74d21b 100644 --- a/src/core/effects.c +++ b/src/core/effects.c @@ -71,7 +71,7 @@ typedef struct MetaScreen *screen; double millisecs_duration; - GTimeVal start_time; + gint64 start_time; /** For wireframe window */ Window wireframe_xwindow; @@ -159,16 +159,14 @@ static gboolean effects_draw_box_animation_timeout (BoxAnimationContext *context) { double elapsed; - GTimeVal current_time; + gint64 current_time; MetaRectangle draw_rect; double fraction; - g_get_current_time (¤t_time); + current_time = g_get_real_time (); /* We use milliseconds for all times */ - elapsed = - ((((double)current_time.tv_sec - context->start_time.tv_sec) * G_USEC_PER_SEC + - (current_time.tv_usec - context->start_time.tv_usec))) / 1000.0; + elapsed = (current_time - context->start_time) / 1000.0; if (elapsed < 0) { @@ -265,7 +263,7 @@ draw_box_animation (MetaScreen *screen, /* Do this only after we get the pixbuf from the server, * so that the animation doesn't get truncated. */ - g_get_current_time (&context->start_time); + context->start_time = g_get_real_time (); /* Add the timeout - a short one, could even use an idle, * but this is maybe more CPU-friendly. |