summaryrefslogtreecommitdiff
path: root/src/core/effects.c
diff options
context:
space:
mode:
authorrbuj <[email protected]>2020-02-03 13:39:55 +0100
committerraveit65 <[email protected]>2020-02-21 17:30:49 +0100
commitdb25f27fd3670e2ebc8ed6f6fa5f918a3251fc96 (patch)
treed101c7c47ceb828c7717273709be80cc99518aea /src/core/effects.c
parent9f9647d27b1d7d01b39241ee3a86f3dfc24196e0 (diff)
downloadmarco-db25f27fd3670e2ebc8ed6f6fa5f918a3251fc96.tar.bz2
marco-db25f27fd3670e2ebc8ed6f6fa5f918a3251fc96.tar.xz
remove warning: 'GTimeVal' is deprecated
Diffstat (limited to 'src/core/effects.c')
-rw-r--r--src/core/effects.c12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/core/effects.c b/src/core/effects.c
index 2866246f..f23c60f2 100644
--- a/src/core/effects.c
+++ b/src/core/effects.c
@@ -79,7 +79,7 @@ typedef struct
MetaScreen *screen;
double millisecs_duration;
- GTimeVal start_time;
+ gint64 start_time;
#ifdef HAVE_SHAPE
/** For wireframe window */
@@ -318,7 +318,7 @@ static gboolean
effects_draw_box_animation_timeout (BoxAnimationContext *context)
{
double elapsed;
- GTimeVal current_time;
+ gint64 current_time;
MetaRectangle draw_rect;
double fraction;
@@ -337,12 +337,10 @@ effects_draw_box_animation_timeout (BoxAnimationContext *context)
#endif /* !HAVE_SHAPE */
- g_get_current_time (&current_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)
{
@@ -481,7 +479,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.