1.1 --- a/src/dsys_impl.h	Sat Aug 20 07:57:00 2011 +0300
     1.2 +++ b/src/dsys_impl.h	Wed Aug 31 05:08:54 2011 +0300
     1.3 @@ -3,16 +3,14 @@
     1.4  
     1.5  #include "dsys2.h"
     1.6  
     1.7 -static float eval_step(struct dsys_event *ev, demotime_t t);
     1.8 -static float eval_lerp(struct dsys_event *ev, demotime_t t);
     1.9 -static float eval_sigmoid(struct dsys_event *ev, demotime_t t);
    1.10 -
    1.11 -
    1.12  struct dsys_demo {
    1.13 -	demotime_t srctime;
    1.14 +	demotime_t tm, src_tm, start_tm, stop_tm, duration;
    1.15 +	demotime_t stoppage_tm;
    1.16  
    1.17  	struct dsys_event *ev;
    1.18  	int num_ev;
    1.19 +
    1.20 +	int running;
    1.21  };
    1.22  
    1.23  struct callback {
    1.24 @@ -32,23 +30,8 @@
    1.25  	float (*eval_func)(struct dsys_event*);
    1.26  
    1.27  	struct callback *cblist;
    1.28 +
    1.29 +	struct dsys_event *next, *prev;
    1.30  };
    1.31  
    1.32 -
    1.33 -static float eval_step(struct dsys_event *ev, demotime_t t)
    1.34 -{
    1.35 -	return t >= ev->t1 ? 1.0 : 0.0;
    1.36 -}
    1.37 -
    1.38 -static float eval_lerp(struct dsys_event *ev, demotime_t t)
    1.39 -{
    1.40 -	return (t - ev->t0) / (ev->t1 - ev->t0);
    1.41 -}
    1.42 -
    1.43 -static float eval_sigmoid(struct dsys_event *ev, demotime_t t)
    1.44 -{
    1.45 -	t = eval_lerp(ev, t);
    1.46 -	return 1.0 - (cos(t * M_PI) * 0.5 + 0.5);
    1.47 -}
    1.48 -
    1.49  #endif	/* DSYS_IMPL_H_ */