callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

timeline: Add _gtk_timeline_get_elapsed_time()

Browse Source 
To get the time in milliseconds since the last frame
This commit is contained in:
Carlos Garcia Campos
2011-02-09 08:53:03 +01:00
committed by Matthias Clasen
parent 170b391e74
commit 168ebb83be
2 changed files with 23 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gtk/gtktimeline.c
View File

@ -35,6 +35,7 @@ struct GtkTimelinePriv
guint source_id; guint source_id;
GTimer *timer; GTimer *timer;
gdouble elapsed_time;
gdouble progress; gdouble progress;
gdouble last_progress; gdouble last_progress;
@ -309,19 +310,18 @@ gtk_timeline_run_frame (GtkTimeline *timeline)
{ {
GtkTimelinePriv *priv; GtkTimelinePriv *priv;
gdouble delta_progress, progress; gdouble delta_progress, progress;
guint elapsed_time;
/* the user may unref us during the signals, so save ourselves */ /* the user may unref us during the signals, so save ourselves */
g_object_ref (timeline); g_object_ref (timeline);
priv = timeline->priv; priv = timeline->priv;
elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000); priv->elapsed_time = (guint) (g_timer_elapsed (priv->timer, NULL) * 1000);
g_timer_start (priv->timer); g_timer_start (priv->timer);
if (priv->animations_enabled) if (priv->animations_enabled)
{ {
delta_progress = (gdouble) elapsed_time / priv->duration; delta_progress = (gdouble) priv->elapsed_time / priv->duration;
progress = priv->last_progress; progress = priv->last_progress;
if (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD) if (priv->direction == GTK_TIMELINE_DIRECTION_BACKWARD)
@ -515,6 +515,25 @@ _gtk_timeline_is_running (GtkTimeline *timeline)
return (priv->source_id != 0); return (priv->source_id != 0);
} }
/**
* gtk_timeline_get_elapsed_time:
* @timeline: A #GtkTimeline
*
* Returns the elapsed time since the last GtkTimeline::frame signal
*
* Return Value: elapsed time in milliseconds since the last frame
**/
guint
_gtk_timeline_get_elapsed_time (GtkTimeline *timeline)
{
GtkTimelinePriv *priv;
g_return_val_if_fail (GTK_IS_TIMELINE (timeline), 0);
priv = timeline->priv;
return priv->elapsed_time;
}
/** /**
* gtk_timeline_get_fps: * gtk_timeline_get_fps:
* @timeline: A #GtkTimeline * @timeline: A #GtkTimeline

1
gtk/gtktimeline.h
View File

@ -84,6 +84,7 @@ void _gtk_timeline_pause (GtkTimeline
void _gtk_timeline_rewind (GtkTimeline *timeline); void _gtk_timeline_rewind (GtkTimeline *timeline);
gboolean _gtk_timeline_is_running (GtkTimeline *timeline); gboolean _gtk_timeline_is_running (GtkTimeline *timeline);
guint _gtk_timeline_get_elapsed_time (GtkTimeline *timeline);
guint _gtk_timeline_get_fps (GtkTimeline *timeline); guint _gtk_timeline_get_fps (GtkTimeline *timeline);
void _gtk_timeline_set_fps (GtkTimeline *timeline, void _gtk_timeline_set_fps (GtkTimeline *timeline,