m-labs · Jan 12, 2012 · Jan 12, 2012
diff --git a/src/compiler/compiler.h b/src/compiler/compiler.h
@@ -77,6 +77,7 @@ enum {
 	pfv_tex_wrap,
 
 	pfv_time,
+	pfv_frame,
 	pfv_bass,
 	pfv_mid,
 	pfv_treb,
@@ -164,6 +165,7 @@ enum {
 	pvv_zoom,
 
 	pvv_time,
+	pvv_frame,
 	pvv_bass,
 	pvv_mid,
 	pvv_treb,

diff --git a/src/compiler/fnp.ids b/src/compiler/fnp.ids
@@ -60,6 +60,7 @@ mv_a		pfv_mv_a	-1
 bTexWrap	pfv_tex_wrap	-1
 
 time		pfv_time	pvv_time
+frame		pfv_frame	pvv_frame
 bass		pfv_bass	pvv_bass
 mid		pfv_mid		pvv_mid
 treb		pfv_treb	pvv_treb

diff --git a/src/compiler/symtab.h b/src/compiler/symtab.h
@@ -34,7 +34,7 @@ extern int num_user_syms;
 
 #define	forall_syms(p) \
 	for ((p) = well_known; (p) != user_syms+num_user_syms; \
-	    (p) = (p) == well_known+num_well_known ? user_syms : (p)+1)
+	    (p) = (p) == well_known+num_well_known-1 ? user_syms : (p)+1)
 
 void symtab_init(void);
 struct sym *unique(const char *s);

diff --git a/src/compiler/test/nsyms b/src/compiler/test/nsyms
@@ -26,7 +26,7 @@ forall_patches count_syms
 echo $max,$ns/$np >_out
 
 expect <<EOF
-12,112/60
+12,111/60
 EOF
 
 ###############################################################################
diff --git a/src/gui/monitor.c b/src/gui/monitor.c
@@ -31,7 +31,7 @@ static int appid;
 
 static int w_open;
 
-static float time2;
+static float time2, frame;
 static float bass, mid, treb;
 static float bass_att, mid_att, treb_att;
 static float idmx[IDMX_COUNT];
@@ -43,6 +43,7 @@ static void sampler_callback(struct frame_descriptor *frd)
 	int i;
 
 	time2 = frd->time;
+	frame = frd->frame;
 
 	bass = frd->bass;
 	mid = frd->mid;
@@ -64,6 +65,7 @@ static void sampler_callback(struct frame_descriptor *frd)
 static float *get_variable(const char *name)
 {
 	if(strcmp(name, "time") == 0) return &time2;
+	if(strcmp(name, "frame") == 0) return &frame;
 
 	else if(strcmp(name, "bass") == 0) return &bass;
 	else if(strcmp(name, "mid") == 0) return &mid;

diff --git a/src/renderer/eval.c b/src/renderer/eval.c
@@ -72,6 +72,7 @@ static void transfer_pvv_regs(struct patch *p)
 	write_pvv(p, pvv_zoom, read_pfv(p, pfv_zoom));
 
 	write_pvv(p, pvv_time, read_pfv(p, pfv_time));
+	write_pvv(p, pvv_frame, read_pfv(p, pfv_frame));
 	write_pvv(p, pvv_bass, read_pfv(p, pfv_bass));
 	write_pvv(p, pvv_mid, read_pfv(p, pfv_mid));
 	write_pvv(p, pvv_treb, read_pfv(p, pfv_treb));
@@ -135,6 +136,7 @@ static void reinit_all_pfv(struct patch *p)
 static void set_pfv_from_frd(struct patch *p, struct frame_descriptor *frd)
 {
 	write_pfv(p, pfv_time, frd->time);
+	write_pfv(p, pfv_time, frd->frame);
 	write_pfv(p, pfv_bass, frd->bass);
 	write_pfv(p, pfv_mid, frd->mid);
 	write_pfv(p, pfv_treb, frd->treb);

diff --git a/src/renderer/framedescriptor.h b/src/renderer/framedescriptor.h
@@ -49,6 +49,7 @@ struct frame_descriptor {
 	int status;
 
 	float time;
+	float frame;
 	struct snd_buffer *snd_buf;
 	float bass, mid, treb;
 	float bass_att, mid_att, treb_att;

diff --git a/src/renderer/sampler.c b/src/renderer/sampler.c
@@ -104,6 +104,7 @@ static rtems_task sampler_task(rtems_task_argument argument)
 	frd_callback callback = (frd_callback)argument;
 	rtems_event_set dummy;
 	float time;
+	int frame;
 
 	snd_fd = open("/dev/snd", O_RDWR);
 	if(snd_fd == -1) {
@@ -128,7 +129,8 @@ static rtems_task sampler_task(rtems_task_argument argument)
 		}
 	}
 
-	time = 0.0;
+	time = 0;
+	frame = 0;
 
 	while(rtems_event_receive(RTEMS_EVENT_0, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT, &dummy) != RTEMS_SUCCESSFUL) {
 		struct snd_buffer *recorded_buf;
@@ -188,6 +190,7 @@ static rtems_task sampler_task(rtems_task_argument argument)
 		recorded_descriptor = (struct frame_descriptor *)recorded_buf->user;
 		/* Analyze */
 		analyze_snd(recorded_descriptor, &history);
+		recorded_descriptor->frame = frame++;
 		recorded_descriptor->time = time;
 		time += 1.0/FPS;
 		/* Get DMX/OSC/MIDI inputs */