diff options
| author | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-13 08:35:05 -0500 |
|---|---|---|
| committer | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-14 17:19:53 -0500 |
| commit | 4c9749ee9e5e57c237ed2f1330ed826e4cc18da6 (patch) | |
| tree | 866155c645d77f18afc12aa9702c4f87b2052208 /gdk/gdkframeclockidle.c | |
| parent | 63a36aa434d8566d891ef36e9ae2a04199513337 (diff) | |
| download | gtk+-4c9749ee9e5e57c237ed2f1330ed826e4cc18da6.tar.gz | |
gdk_frame_clock_get_frame_time(): use gint64 for time
Diffstat (limited to 'gdk/gdkframeclockidle.c')
| -rw-r--r-- | gdk/gdkframeclockidle.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/gdk/gdkframeclockidle.c b/gdk/gdkframeclockidle.c index 5974e269ea..5e751b3d92 100644 --- a/gdk/gdkframeclockidle.c +++ b/gdk/gdkframeclockidle.c @@ -37,9 +37,9 @@ struct _GdkFrameClockIdlePrivate { GTimer *timer; /* timer_base is used to avoid ever going backward */ - guint64 timer_base; - guint64 frame_time; - guint64 min_next_frame_time; + gint64 timer_base; + gint64 frame_time; + gint64 min_next_frame_time; gint64 sleep_serial; guint flush_idle_id; @@ -135,12 +135,12 @@ gdk_frame_clock_idle_finalize (GObject *object) G_OBJECT_CLASS (gdk_frame_clock_idle_parent_class)->finalize (object); } -static guint64 +static gint64 compute_frame_time (GdkFrameClockIdle *idle) { GdkFrameClockIdlePrivate *priv = idle->priv; - guint64 computed_frame_time; - guint64 elapsed; + gint64 computed_frame_time; + gint64 elapsed; elapsed = g_get_monotonic_time () + priv->timer_base; if (elapsed < priv->frame_time) @@ -160,11 +160,11 @@ compute_frame_time (GdkFrameClockIdle *idle) return computed_frame_time; } -static guint64 +static gint64 gdk_frame_clock_idle_get_frame_time (GdkFrameClock *clock) { GdkFrameClockIdlePrivate *priv = GDK_FRAME_CLOCK_IDLE (clock)->priv; - guint64 computed_frame_time; + gint64 computed_frame_time; /* can't change frame time during a paint */ if (priv->phase != GDK_FRAME_CLOCK_PHASE_NONE && @@ -196,8 +196,8 @@ maybe_start_idle (GdkFrameClockIdle *clock_idle) if (priv->min_next_frame_time != 0) { - guint64 now = compute_frame_time (clock_idle); - guint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now; + gint64 now = compute_frame_time (clock_idle); + gint64 min_interval_us = MAX (priv->min_next_frame_time, now) - now; min_interval = (min_interval_us + 500) / 1000; } |