[Gridflow-cvs] [svn] commit: r4036 - in /trunk: base/grid.c gridflow.h

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Wed Jul 16 14:59:58 EDT 2008


Author: matju
Date: Wed Jul 16 14:59:58 2008
New Revision: 4036

Log:
remove GridInlet::frozen

Modified:
    trunk/base/grid.c
    trunk/gridflow.h

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Wed Jul 16 14:59:58 2008
@@ -150,9 +150,7 @@
 #define CATCH_IT catch (Barf &slimy) {post("error during flow: %s",slimy.text);}
 
 template <class T> void GridInlet::flow(long n, T *data) {TRACE;
-	CHECK_BUSY(inlet);
-	CHECK_TYPE(*data);
-	CHECK_ALIGN(data);
+	CHECK_BUSY(inlet); CHECK_TYPE(*data); CHECK_ALIGN(data);
 	if (!mode) {dex += n; return;} // ignore data
 	if (!n) return; // no data
 	long d = dex + bufi;
@@ -231,8 +229,7 @@
 /* **************** GridOutlet ************************************ */
 
 GridOutlet::GridOutlet(FObject *parent_, int woutlet, P<Dim> dim_, NumberTypeE nt_) {
-	parent=parent_; dim=dim_; nt=nt_; dex=0; frozen=false; bufi=0; buf=0;
-	begin(woutlet,dim,nt);
+	parent=parent_; dim=dim_; nt=nt_; dex=0; bufi=0; buf=0; begin(woutlet,dim,nt);
 }
 
 void GridOutlet::create_buf () {TRACE;
@@ -257,7 +254,6 @@
 	t_atom a[1];
 	SETGRIDOUT(a,this);
 	outlet_anything(parent->bself->outlets[woutlet],bsym._grid,1,a);
-	frozen=true;
 	if (!dim->prod()) {finish(); return;}
 }
 

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Wed Jul 16 14:59:58 2008
@@ -791,8 +791,6 @@
 	// unbuffered mode, flush() must be called
 	template <class T> void send(long n, T *data);
 	void flush(); // goes with send();
-
-	bool frozen; // is the "begin" phase finished?
 	PtrGrid buf; // temporary buffer
 	long bufi; // number of bytes used in the buffer
 	void begin(int woutlet, P<Dim> dim, NumberTypeE nt=int32_e);



More information about the Gridflow-cvs mailing list