diff options
author | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-12 15:47:38 -0500 |
---|---|---|
committer | Owen W. Taylor <otaylor@fishsoup.net> | 2013-02-14 17:19:52 -0500 |
commit | 515e5f74aadcef7d1d55f593fa16d9e3c1f3fb4b (patch) | |
tree | fd67c7de661cc0d910216dd06fe8ccbc76ea7165 /gdk/gdkframeclock.h | |
parent | 5f2d1654a5085fb64af96310e297db4a7c4a39c2 (diff) | |
download | gtk+-515e5f74aadcef7d1d55f593fa16d9e3c1f3fb4b.tar.gz |
Merge GdkFrameHistory into GdkFrameClock
Now that GdkFrameClock is a class, not interface, there's no real advantage
to splitting the frame history into an aggregate object, so directly
merge it into GdkFrameClock.
Diffstat (limited to 'gdk/gdkframeclock.h')
-rw-r--r-- | gdk/gdkframeclock.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/gdk/gdkframeclock.h b/gdk/gdkframeclock.h index 608d74320b..3780615bfa 100644 --- a/gdk/gdkframeclock.h +++ b/gdk/gdkframeclock.h @@ -31,7 +31,7 @@ #ifndef __GDK_FRAME_CLOCK_H__ #define __GDK_FRAME_CLOCK_H__ -#include <gdk/gdkframehistory.h> +#include <gdk/gdkframetimings.h> G_BEGIN_DECLS @@ -68,7 +68,12 @@ GdkFrameClockPhase gdk_frame_clock_get_requested (GdkFrameClock *clock); void gdk_frame_clock_freeze (GdkFrameClock *clock); void gdk_frame_clock_thaw (GdkFrameClock *clock); -GdkFrameHistory *gdk_frame_clock_get_history (GdkFrameClock *clock); +/* Frame history */ +gint64 gdk_frame_clock_get_frame_counter (GdkFrameClock *clock); +gint64 gdk_frame_clock_get_start (GdkFrameClock *clock); +GdkFrameTimings *gdk_frame_clock_get_timings (GdkFrameClock *clock, + gint64 frame_counter); +GdkFrameTimings *gdk_frame_clock_get_last_complete (GdkFrameClock *clock); /* Convenience API */ void gdk_frame_clock_get_frame_time_val (GdkFrameClock *clock, |