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

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Jul 18 10:02:03 EDT 2008


Author: matju
Date: Fri Jul 18 10:02:01 2008
New Revision: 4045

Log:
merged GridOutlet::begin into GridOutlet::GridOutlet

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

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Fri Jul 18 10:02:01 2008
@@ -213,7 +213,11 @@
 /* **************** GridOutlet ************************************ */
 
 GridOutlet::GridOutlet(FObject *parent_, int woutlet, P<Dim> dim_, NumberTypeE nt_) {
-	parent=parent_; dim=dim_; nt=nt_; dex=0; bufi=0; buf=0; begin(woutlet,dim,nt);
+	parent=parent_; dim=dim_; nt=nt_; dex=0; bufi=0; buf=0;
+	t_atom a[1];
+	SETGRIDOUT(a,this);
+	outlet_anything(parent->bself->outlets[woutlet],bsym._grid,1,a);
+	if (!dim->prod()) {finish(); return;}
 }
 
 void GridOutlet::create_buf () {
@@ -232,15 +236,6 @@
 #endif
 }
 
-void GridOutlet::begin(int woutlet, P<Dim> dim, NumberTypeE nt) {
-	this->nt = nt;
-	this->dim = dim;
-	t_atom a[1];
-	SETGRIDOUT(a,this);
-	outlet_anything(parent->bself->outlets[woutlet],bsym._grid,1,a);
-	if (!dim->prod()) {finish(); return;}
-}
-
 // send modifies dex; send_direct doesn't
 template <class T>
 void GridOutlet::send_direct(long n, T *data) {

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Fri Jul 18 10:02:01 2008
@@ -795,7 +795,6 @@
 	void flush(); // goes with send();
 	PtrGrid buf; // temporary buffer
 	long bufi; // number of bytes used in the buffer
-	void begin(int woutlet, P<Dim> dim, NumberTypeE nt=int32_e);
 	template <class T> void send_direct(long n, T *data);
 	void finish();
 	void create_buf();



More information about the Gridflow-cvs mailing list