isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-06-14 01:09:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

2006-08-15 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/clutter-behaviour.c:
        * clutter/clutter-behaviour.h:
        * clutter/clutter-behaviours.c:
        * clutter/clutter-timeline.c:
        * clutter/clutter-timeline.h:
        * clutter/clutter.h:
        Make basic behaviour infrastructure actually work.

        * examples/Makefile.am:
        * examples/behave.c:
        Add a simple behaviour demo/test

        * clutter/clutter-media.c: (clutter_media_set_volume):
        Actuall set volume rather than position..   (Fixes #141)
This commit is contained in:
Matthew Allum
2006-08-15 20:28:41 +00:00
parent c13b025083
commit 2c41d38fed
12 changed files with 174 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
clutter/clutter-timeline.c
View File

@ -86,6 +86,32 @@ clutter_timeline_alpha_ramp_inc_func (ClutterTimeline *timeline)
/ timeline->priv->nframes;
}
guint32
clutter_timeline_alpha_ramp_dec_func (ClutterTimeline *timeline)
{
return ((timeline->priv->nframes - timeline->priv->current_frame_num)
* CLUTTER_TIMELINE_MAX_ALPHA)
/ timeline->priv->nframes;
}
guint32
clutter_timeline_alpha_ramp_func (ClutterTimeline *timeline)
{
if (timeline->priv->current_frame_num > (timeline->priv->nframes/2))
{
return (((timeline->priv->nframes) - timeline->priv->current_frame_num)
* CLUTTER_TIMELINE_MAX_ALPHA)
/ (timeline->priv->nframes/2);
}
else
{
return (timeline->priv->current_frame_num * CLUTTER_TIMELINE_MAX_ALPHA)
/ (timeline->priv->nframes/2);
}
}
/* Object */
static void
@ -269,6 +295,8 @@ clutter_timeline_init (ClutterTimeline *self)
self->priv = G_TYPE_INSTANCE_GET_PRIVATE(self,
CLUTTER_TYPE_TIMELINE,
ClutterTimelinePrivate);
self->priv->alpha_func = CLUTTER_ALPHA_RAMP_INC;
}
static gboolean
@ -323,21 +351,23 @@ timeline_timeout_func (gpointer data)
priv->last_frame_msecs = msecs;
/* Advance frames */
priv->current_frame_num += nframes;;
/* Update alpha value */
if (priv->alpha_func)
priv->alpha = priv->alpha_func(timeline);
/* Advance frames */
priv->current_frame_num += nframes;;
/* Handle loop or stop */
if (priv->current_frame_num > priv->nframes)
{
priv->current_frame_num = priv->nframes;
if (nframes > 1)
g_signal_emit (timeline, timeline_signals[SIGNAL_NEW_FRAME],
0, priv->current_frame_num);
{
g_signal_emit (timeline, timeline_signals[SIGNAL_NEW_FRAME],
0, priv->current_frame_num);
}
if (priv->loop)
clutter_timeline_rewind (timeline);
@ -593,6 +623,19 @@ clutter_timeline_get_alpha (ClutterTimeline *timeline)
return timeline->priv->alpha;
}
/**
* clutter_timeline_set_alpha_func:
* @timeline: A #ClutterTimeline
* @func: A #ClutterTimelineAlphaFunc
*
*/
void
clutter_timeline_set_alpha_func (ClutterTimeline *timeline,
ClutterTimelineAlphaFunc func)
{
timeline->priv->alpha_func = func;
}
/**
* clutter_timeline_new:
* @nframes: #ClutterTimeline number of frames