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

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Jul 11 17:14:17 EDT 2008


Author: matju
Date: Fri Jul 11 17:14:16 2008
New Revision: 4017

Log:
fix previous commit about A_GRIDOUT

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

Modified: trunk/base/grid.c
==============================================================================
--- trunk/base/grid.c (original)
+++ trunk/base/grid.c Fri Jul 11 17:14:16 2008
@@ -137,8 +137,7 @@
 #undef FOO
 }
 
-void GridInlet::begin(int argc, t_atom2 *argv) {TRACE;
-	GridOutlet *back_out = (GridOutlet *) (void *)argv[0];
+void GridInlet::begin(GridOutlet *back_out) {TRACE;
 	nt = back_out->nt;
 	if (dim) RAISE("%s: grid inlet conflict; aborting %s in favour of %s, index %ld of %ld",
 			ARGS(parent), ARGS(sender), ARGS(back_out->parent), (long)dex, (long)dim->prod());

Modified: trunk/base/source_filter.rb
==============================================================================
--- trunk/base/source_filter.rb (original)
+++ trunk/base/source_filter.rb Fri Jul 11 17:14:16 2008
@@ -271,7 +271,7 @@
 		ks = k.map{|ke| if ke==0 then 0 else cli end}.join(",")
 		Out.print "static GridHandler #{cl}_grid_#{i}_hand = GRIN(#{ks});"
 		handle_def "#{i} grid(GridOutlet *foo) {CHECK_GRIN(#{cl},#{i});"+
-			"in[#{i}]->begin(argc,argv);}"
+			"in[#{i}]->begin(foo);}"
 		handle_def "#{i} list(...) {CHECK_GRIN(#{cl},#{i});"+
 			"in[#{i}]->from_list(argc,argv,int32_e);}" if not frame.methods["_#{i}_list"].done
 		handle_def "#{i} float(float f) {CHECK_GRIN(#{cl},#{i});"+

Modified: trunk/gridflow.h
==============================================================================
--- trunk/gridflow.h (original)
+++ trunk/gridflow.h Fri Jul 11 17:14:16 2008
@@ -735,7 +735,7 @@
 	void set_chunk(long whichdim);
 	void set_mode(int mode_) {mode=mode_;}
 	int32 factor() {return buf?buf->dim->prod():1;}
-	void begin(int argc, t_atom2 *argv);
+	void begin(GridOutlet *back_out);
 	void finish(); /* i thought this should be private but maybe it shouldn't. */
 
 	// n=-1 is begin, and n=-2 is finish; GF-0.9 may have n=-3 meaning alloc (?).



More information about the Gridflow-cvs mailing list