X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?a=blobdiff_plain;f=src%2Fdemosys.h;h=11ec714d74b160cc5e4a9860f60c4af2830fa4bb;hb=628ef3345462458f2fb6be034583e61238b89f89;hp=717ac4ec03cc15c3463d669391325e5a52916615;hpb=295b86a1a8efdfe4fb0d9dba6152eb956441603c;p=andemo

diff --git a/src/demosys.h b/src/demosys.h
index 717ac4e..11ec714 100644
--- a/src/demosys.h
+++ b/src/demosys.h
@@ -21,10 +21,18 @@ struct demoscreen {
 	void (*motion)(int x, int y);
 
 	struct anm_track track;
-	int active, prio;
+	long start_time;
+	int prio;
 	float vis;
 };
 
+struct demoevent {
+	char *name;
+	struct anm_track track;
+	float value;
+	struct demoscreen *scr;
+};
+
 #define MAX_DSYS_SCREENS	64
 struct demosystem {
 	int running;			/* run/stop state */
@@ -36,10 +44,11 @@ struct demosystem {
 	struct demoscreen *act[MAX_DSYS_SCREENS];
 	int num_act;
 
+	struct demoscreen *scr_override;
+
 	void *trackmap;
-	struct anm_track *track;
-	float *value;				/* values for each track, stored on update */
-	int num_tracks;
+	struct demoevent *ev;
+	int num_ev;
 };
 
 struct demosystem dsys;
@@ -64,8 +73,8 @@ void dsys_run_screen(struct demoscreen *scr);
 int dsys_add_screen(struct demoscreen *scr);
 
 /* demo event tracks */
-int dsys_add_track(const char *name);
-int dsys_find_track(const char *name);
+int dsys_add_event(const char *name);
+int dsys_find_event(const char *name);
 float dsys_value(const char *name);
 
 #endif	/* DEMOSYS_H_ */