[Gridflow-cvs] [svn] commit: r4860 - /trunk/src/classes2.cxx

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Fri Nov 20 10:56:41 EST 2009


Author: matju
Date: Fri Nov 20 10:56:32 2009
New Revision: 4860

Log:
rename the other outlet_atom to outlet_atom2 because of conflict (oops). this should be resolved a bit later.

Modified:
    trunk/src/classes2.cxx

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Fri Nov 20 10:56:32 2009
@@ -89,6 +89,10 @@
 	void process_args (int argc, t_atom *argv);
 };
 /* get the owner of the result of canvas_getenv */
+#ifdef DESIRE
+#define gl_env env
+#define gl_owner mom
+#endif
 static t_canvas *canvas_getabstop(t_canvas *x) {
     while (!x->gl_env) if (!(x = x->gl_owner)) bug("t_canvasenvironment", x);
     return x;
@@ -234,7 +238,7 @@
 //doc_out:_0_float,"position of the incoming float in the stored list"
 \end class {install("listfind",2,1);}
 
-void outlet_atom (t_outlet *self, t_atom *av) {
+void outlet_atom2 (t_outlet *self, t_atom *av) {
 	if (av->a_type==A_FLOAT)   outlet_float(  self,av->a_float);    else
 	if (av->a_type==A_SYMBOL)  outlet_symbol( self,av->a_symbol);   else
 	if (av->a_type==A_POINTER) outlet_pointer(self,av->a_gpointer); else
@@ -253,7 +257,7 @@
 	int i = int(f);
 	if (i<0) i+=ac;
 	if (i<0 || i>=ac) {outlet_bang(outlets[0]); return;} /* out-of-range */
-	outlet_atom(outlets[0],&at[i]);
+	outlet_atom2(outlets[0],&at[i]);
 }
 \def 1 list (...) {
 	if (at) delete[] at;
@@ -388,6 +392,7 @@
 	}
 };
 #define INIT BFObject *bself = (BFObject*)x; Display *self = (Display *)bself->self; t_canvas *c = glist_getcanvas(glist); c=c;
+#undef L
 #define L if (0) post("%s",__PRETTY_FUNCTION__);
 static void display_getrectfn(t_gobj *x, t_glist *glist, int *x1, int *y1, int *x2, int *y2) {INIT
 	*x1 = bself->te_xpix-1; *x2 = bself->te_xpix+1+self->sx;
@@ -806,12 +811,7 @@
 	\decl 0 list (...);
 };
 \def 0 list (...) {
-	t_outlet *o = outlets[0];
-	for (int i=0; i<argc; i++) {
-		if      (argv[i].a_type==A_FLOAT)  outlet_float( o,argv[i]);
-		else if (argv[i].a_type==A_SYMBOL) outlet_symbol(o,argv[i]);
-		else RAISE("oops. unsupported.");
-	}
+	for (int i=0; i<argc; i++) outlet_atom(outlets[0],&argv[i]);
 }
 \end class {install("foreach",1,1);}
 



More information about the Gridflow-cvs mailing list