[Gridflow-cvs] [svn] commit: r5661 - in /trunk/src: aalib.cxx classes1.cxx classes2.cxx classes3.cxx formats.cxx gem.cxx gridflow.cxx gridflow.hxx jpeg.cxx mpeg3.cxx opencv.cxx png.cxx quicktimehw.cxx sdl.cxx source_filter.rb v4l2.cxx videodev.cxx x11.cxx

svn-gridflow at artengine.ca svn-gridflow at artengine.ca
Wed May 12 18:06:37 EDT 2010


Author: matju
Date: Wed May 12 18:06:35 2010
New Revision: 5661

Log:
\decl and \def only pass argc,argv when there is a "..." argument

Modified:
    trunk/src/aalib.cxx
    trunk/src/classes1.cxx
    trunk/src/classes2.cxx
    trunk/src/classes3.cxx
    trunk/src/formats.cxx
    trunk/src/gem.cxx
    trunk/src/gridflow.cxx
    trunk/src/gridflow.hxx
    trunk/src/jpeg.cxx
    trunk/src/mpeg3.cxx
    trunk/src/opencv.cxx
    trunk/src/png.cxx
    trunk/src/quicktimehw.cxx
    trunk/src/sdl.cxx
    trunk/src/source_filter.rb
    trunk/src/v4l2.cxx
    trunk/src/videodev.cxx
    trunk/src/x11.cxx

Modified: trunk/src/aalib.cxx
==============================================================================
--- trunk/src/aalib.cxx (original)
+++ trunk/src/aalib.cxx Wed May 12 18:06:35 2010
@@ -41,7 +41,7 @@
 	\attr bool autodraw;
 	bool raw_mode;
 	/* !@#$ varargs missing here */
-	\constructor (t_symbol *mode, string target) {
+	\constructor (t_symbol *mode, string target, ...) {
 		context=0; autodraw=1;
 		argc-=2; argv+=2;
 		char *argv2[argc];

Modified: trunk/src/classes1.cxx
==============================================================================
--- trunk/src/classes1.cxx (original)
+++ trunk/src/classes1.cxx Wed May 12 18:06:35 2010
@@ -338,7 +338,7 @@
 			if (row>maxrows) {puts("..."); break;}
 		}
 	}
-	end_hook(0,0);
+	end_hook();
 } GRID_FINISH {
 	std::ostringstream head;
 	dump_dims(head,in);
@@ -873,7 +873,8 @@
 		this->to  =to;
 		this->step=step;
 	}
-	\decl 0 set (Grid *r=0) {from=new Grid(argv[0]);}
+	//\decl 0 set (Grid *l=0) {from=new Grid(argv[0]);}
+	\decl 0 set (Grid *l=0) {from=l;}
 	\decl 0 bang ();
 	\grin 0
 	\grin 1
@@ -934,7 +935,7 @@
 
 GRID_INPUT(2,step) {} GRID_END
 GRID_INPUT(1,to) {} GRID_END
-GRID_INPUT(0,from) {_0_bang(0,0);} GRID_END
+GRID_INPUT(0,from) {_0_bang();} GRID_END
 \end class {install("#for",3,1); add_creator("@for");}
 
 //****************************************************************

Modified: trunk/src/classes2.cxx
==============================================================================
--- trunk/src/classes2.cxx (original)
+++ trunk/src/classes2.cxx Wed May 12 18:06:35 2010
@@ -21,10 +21,10 @@
 
 #include "gridflow.hxx.fcs"
 #ifdef DESIRE
-#warning Bleuet
+//#warning Bleuet
 #include "desire.h"
 #else
-#warning Vanille
+//#warning Vanille
 extern "C" {
 #include "bundled/g_canvas.h"
 #include "bundled/m_imp.h"
@@ -207,7 +207,7 @@
 \end class {install("listflatten",1,1);}
 
 // does not do recursive comparison of lists.
-static bool atom_eq (t_atom &a, t_atom &b) {
+static bool atom_eq (const t_atom &a, const t_atom &b) {
 	if (a.a_type!=b.a_type) return false;
 	if (a.a_type==A_FLOAT)   return a.a_float   ==b.a_float;
 	if (a.a_type==A_SYMBOL)  return a.a_symbol  ==b.a_symbol;
@@ -228,9 +228,9 @@
 		at = new t_atom[argc];
 		for (int i=0; i<argc; i++) at[i] = argv[i];
 	}
-	\decl 0 float( float     f) {find(argv);}
-	\decl 0 symbol(t_symbol *s) {find(argv);}
-	void find (t_atom *a) {
+	\decl 0 float (t_atom2 a) {find(&a);}
+	\decl 0 symbol(t_atom2 a) {find(&a);}
+	void find (const t_atom *a) {
 		int i=0; for (; i<ac; i++) if (atom_eq(at[i],*a)) break;
 		outlet_float(outlets[0],i==ac?-1:i);
 	}
@@ -280,11 +280,11 @@
 		int i; for (i=0; i<nmosusses; i++) if (f<mosusses[i]) break;
 		outlet_float(outlets[i],f);
 	}
-	\decl 0 list(float f) {_0_float(argc,argv,f);}
+	\decl 0 list(float f) {_0_float(f);}
 	\decl void _n_float(int i, float f);
 };
  // precedence problem in dispatcher... does this problem still exist?
-\def void _n_float(int i, float f) {if (!i) _0_float(argc,argv,f); else mosusses[i-1] = f;}
+\def void _n_float(int i, float f) {if (!i) _0_float(f); else mosusses[i-1] = f;}
 \end class {install("range",1,1); add_creator("gf/range");}
 
 //****************************************************************
@@ -1055,21 +1055,21 @@
 
 \class UserTime : FObject {
 	clock_t time;
-	\constructor () {_0_bang(argc,argv);}
+	\constructor () {_0_bang();}
 	\decl 0 bang () {NOWIN; struct tms t; times(&t); time = t.tms_utime;}
 	\decl 1 bang () {NOWIN; struct tms t; times(&t); outlet_float(outlets[0],(t.tms_utime-time)*1000/HZ);}
 };
 \end class {install("usertime",2,1);}
 \class SystemTime : FObject {
 	clock_t time;
-	\constructor () {_0_bang(argc,argv);}
+	\constructor () {_0_bang();}
 	\decl 0 bang () {NOWIN; struct tms t; times(&t); time = t.tms_stime;}
 	\decl 1 bang () {NOWIN; struct tms t; times(&t); outlet_float(outlets[0],(t.tms_stime-time)*1000/HZ);}
 };
 \end class {install("systemtime",2,1);}
 \class TSCTime : FObject {
 	uint64 time;
-	\constructor () {_0_bang(argc,argv);}
+	\constructor () {_0_bang();}
 	\decl 0 bang () {time=rdtsc();}
 	\decl 1 bang () {outlet_float(outlets[0],(rdtsc()-time)*1000.0/cpu_hertz);}
 };
@@ -1099,9 +1099,9 @@
 		}
 		format = o.str();
 	}
-	\decl 0 bang  ()             {_0_list(0,0);}
-	\decl 0 float (float f)      {_0_list(argc,argv);}
-	\decl 0 symbol (t_symbol *s) {_0_list(argc,argv);}
+	\decl 0 bang   ()          {_0_list(0,0);}
+	\decl 0 float  (t_atom2 a) {_0_list(1,&a);}
+	\decl 0 symbol (t_atom2 a) {_0_list(1,&a);}
 	\decl 0 list (...);
 };
 
@@ -1550,8 +1550,8 @@
 	\constructor () {}
 	\decl 0 get (t_symbol *s=0) {
 		if (!s) {
-			_0_get(0,0,gensym("version"));
-			_0_get(0,0,gensym("folder"));
+			_0_get(gensym("version"));
+			_0_get(gensym("folder"));
 		}
 		if (s==gensym("version")) {
 			t_atom a[3];

Modified: trunk/src/classes3.cxx
==============================================================================
--- trunk/src/classes3.cxx (original)
+++ trunk/src/classes3.cxx Wed May 12 18:06:35 2010
@@ -1214,8 +1214,8 @@
 		TYPESWITCH(a->nt,FOO,);
 		#undef FOO
 	}
-	\decl void _n_float (int inlet, float f) {_n_set(argc,argv,inlet,f); _0_bang(argc,argv);}
-	\decl void _n_list  (int inlet, float f) {_n_set(argc,argv,inlet,f); _0_bang(argc,argv);}
+	\decl void _n_float (int inlet, float f) {_n_set(inlet,f); _0_bang();}
+	\decl void _n_list  (int inlet, float f) {_n_set(inlet,f); _0_bang();}
 	\decl 0 bang () {
 		out=new GridOutlet(this,0,a->dim,a->nt);
 		#define FOO(T) out->send(n,(T *)*a);
@@ -1224,8 +1224,8 @@
 	}
 	\decl 0 list (...) {
 		if (argc>n) argc=n;
-		for (int i=0; i<argc; i++) _n_set(0,0,i,argv[i]);
-		_0_bang(0,0);
+		for (int i=0; i<argc; i++) _n_set(i,argv[i]);
+		_0_bang();
 	}
 	//\grin 0
 };
@@ -1259,7 +1259,7 @@
 	\decl 0 axis (int from, int to, int n);
 	\constructor (int from=0, int to=1, int n=2) {
 		angle=0;
-		_0_axis(0,0,from,to,n);
+		_0_axis(from,to,n);
 	}
 	\decl 1 float(int angle) {this->angle = angle;}
 };
@@ -1292,7 +1292,7 @@
 	\attr PtrGrid sums;
 	\attr PtrGrid counts;
 	\constructor (int v) {
-		_1_float(0,0,v);
+		_1_float(v);
 		r.constrain(expect_min_one_dim);
 		r = new Grid(Dim(0));
 	}

Modified: trunk/src/formats.cxx
==============================================================================
--- trunk/src/formats.cxx (original)
+++ trunk/src/formats.cxx Wed May 12 18:06:35 2010
@@ -110,7 +110,7 @@
 	if (mode==gensym("out")) fmode="w"; else
 	#endif
 	RAISE("bad mode");
-	if (f) _0_close(0,0);
+	if (f) _0_close();
 	if (mode==gensym("in")) {filename = gf_find_file(filename);}
 	f = fopen(filename.data(),fmode);
 	if (!f) RAISE("can't open file '%s': %s",filename.data(),strerror(errno));
@@ -129,7 +129,7 @@
 \def 0 cast(NumberTypeE nt) {cast = nt;}
 
 \def 0 seek(int frame) {
-	if (!frame) {_0_rewind(0,0); return;}
+	if (!frame) {_0_rewind(); return;}
 	RAISE("don't know how to seek for frame other than # 0");
 }
 
@@ -142,7 +142,7 @@
 	frame = 0;
 }
 
-Format::~Format () {_0_close(0,0);}
+Format::~Format () {_0_close();}
 \end class Format {}
 
 /* This is the Grid format I defined: */
@@ -167,7 +167,7 @@
 	\constructor (t_symbol *mode, string filename) {
 		nt = int32_e;
 		endian = is_le();
-		_0_open(0,0,mode,filename);
+		_0_open(mode,filename);
 	}
 	\decl 0 bang ();
 	\decl 0 headerless (...);
@@ -221,7 +221,7 @@
 	out.send(nn,(T *)data);}
 TYPESWITCH(nt,FOO,)
 #undef FOO
-	SUPER;
+	call_super(0,0);
 }
 
 GRID_INLET(0) {
@@ -277,9 +277,7 @@
 
 \class FormatNetPBM : Format {
 	\grin 0
-	\constructor (t_symbol *mode, string filename) {
-		Format::_0_open(0,0,mode,filename);
-	}
+	\constructor (t_symbol *mode, string filename) {Format::_0_open(mode,filename);}
 	uint32 getuint() {
 		uint32 i=0;
 		char ch; do {

Modified: trunk/src/gem.cxx
==============================================================================
--- trunk/src/gem.cxx (original)
+++ trunk/src/gem.cxx Wed May 12 18:06:35 2010
@@ -222,7 +222,7 @@
 	\constructor () {
 		yflip = false;
 		cast = int32_e;
-		_0_colorspace(0,0,gensym("rgba"));
+		_0_colorspace(gensym("rgba"));
 	}
 	virtual ~GridFromPix () {}
 	\decl 0 gem_state (...);

Modified: trunk/src/gridflow.cxx
==============================================================================
--- trunk/src/gridflow.cxx (original)
+++ trunk/src/gridflow.cxx Wed May 12 18:06:35 2010
@@ -40,10 +40,10 @@
 #include <limits.h>
 
 #ifdef HAVE_DESIREDATA
-#warning Bleuet
+//#warning Bleuet
 #include "desire.h"
 #else
-#warning Vanille
+//#warning Vanille
 extern "C" {
 #include "bundled/g_canvas.h"
 #include "bundled/m_imp.h"

Modified: trunk/src/gridflow.hxx
==============================================================================
--- trunk/src/gridflow.hxx (original)
+++ trunk/src/gridflow.hxx Wed May 12 18:06:35 2010
@@ -851,7 +851,6 @@
 void add_creator3(FClass *fclass, const char *name);
 #define install_format(name,mode,suffixes) do {install(name,1,1); suffixes_are(name,suffixes);} while(0)
 void call_super(int argc, t_atom *argv);
-#define SUPER call_super(argc,argv);
 
 \class Format : FObject {
 	int mode;

Modified: trunk/src/jpeg.cxx
==============================================================================
--- trunk/src/jpeg.cxx (original)
+++ trunk/src/jpeg.cxx Wed May 12 18:06:35 2010
@@ -39,7 +39,7 @@
 	struct jpeg_error_mgr jerr;
 	short quality;
 	\constructor (t_symbol *mode, string filename) {
-		Format::_0_open(0,0,mode,filename);
+		Format::_0_open(mode,filename);
 		uint32 mask[3] = {0x0000ff,0x00ff00,0xff0000};
 		bit_packing = new BitPacking(is_le(),3,3,mask);
 		quality = 75;

Modified: trunk/src/mpeg3.cxx
==============================================================================
--- trunk/src/mpeg3.cxx (original)
+++ trunk/src/mpeg3.cxx Wed May 12 18:06:35 2010
@@ -43,15 +43,12 @@
 	#endif
 		if (!mpeg) RAISE("IO Error: can't open file `%s': %s", filename.data(), strerror(errno));
 	}
-	\decl 0 seek (int32 frame);
-	\decl 0 rewind ();
+	\decl 0 seek (int32 frame) {
+		mpeg3_set_frame(mpeg,clip(frame,int32(0),int32(mpeg3_video_frames(mpeg,track)-1)),track);
+	}
+	\decl 0 rewind () {_0_seek(0);}
 	\decl 0 bang ();
 };
-
-\def 0 seek (int32 frame) {
-	mpeg3_set_frame(mpeg,clip(frame,int32(0),int32(mpeg3_video_frames(mpeg,track)-1)),track);
-}
-\def 0 rewind () {_0_seek(0,0,0);}
 
 \def 0 bang () {
 	int nframe = mpeg3_get_frame(mpeg,track);

Modified: trunk/src/opencv.cxx
==============================================================================
--- trunk/src/opencv.cxx (original)
+++ trunk/src/opencv.cxx Wed May 12 18:06:35 2010
@@ -458,14 +458,9 @@
 	\attr int numClusters;
 	\attr CvTermCriteria termcrit;
 	\grin 0 float32
-	\decl 1 float (int v);
-	\constructor (int v) {
-		_1_float(0,0,v);
-		termcrit = CvTermCriteria();
-	}
-};
-
-\def 1 float (int v) {numClusters = v;}
+	\decl 1 float (int v) {numClusters = v;}
+	\constructor (int v) {_1_float(v); termcrit = CvTermCriteria();}
+};
 
 //post("typeof(a)=%p typeof(c)=%p typeof(CvMat)=%p",cvTypeOf(a),cvTypeOf(c),cvFindType("opencv-matrix"));
 //for (CvTypeInfo *t = cvFirstType(); t; t=t->next) post("type %s",t->type_name);

Modified: trunk/src/png.cxx
==============================================================================
--- trunk/src/png.cxx (original)
+++ trunk/src/png.cxx Wed May 12 18:06:35 2010
@@ -32,7 +32,7 @@
 	png_structp png;
 	png_infop info;
 	\constructor (t_symbol *mode, string filename) {
-		Format::_0_open(0,0,mode,filename);
+		Format::_0_open(mode,filename);
 		uint32 mask[3] = {0x0000ff,0x00ff00,0xff0000};
 		bit_packing = new BitPacking(is_le(),3,3,mask);
 	}

Modified: trunk/src/quicktimehw.cxx
==============================================================================
--- trunk/src/quicktimehw.cxx (original)
+++ trunk/src/quicktimehw.cxx Wed May 12 18:06:35 2010
@@ -60,7 +60,7 @@
 				RAISE("quicktime: unsupported codec: %s", quicktime_video_compressor(anim,track));
 	*/
 		}
-		_0_colorspace(0,0,string("rgb"));
+		_0_colorspace(string("rgb"));
 		quicktime_set_cpus(anim,1);
 		uint32 mask[3] = {0x0000ff,0x00ff00,0xff0000};
 		bit_packing = new BitPacking(is_le(),3,3,mask);
@@ -68,7 +68,7 @@
 	}
 	\decl 0 bang ();
 	\decl 0 seek (int32 frame);
-	\decl 0 rewind ();
+	\decl 0 rewind () {_0_seek(0);}
 	\decl 0 force_size (int32 height, int32 width);
 	\decl 0 colorspace (string c);
 	\decl 0 parameter (string name, int32 value);
@@ -88,7 +88,6 @@
 \def 0 seek (int32 frame) {
 	quicktime_set_video_position(anim,clip(frame,int32(0),int32(quicktime_video_length(anim,track)-1)),track);
 }
-\def 0 rewind () {_0_seek(0,0,0);}
 
 \def 0 bang () {
 	if (with_audio) {

Modified: trunk/src/sdl.cxx
==============================================================================
--- trunk/src/sdl.cxx (original)
+++ trunk/src/sdl.cxx Wed May 12 18:06:35 2010
@@ -168,7 +168,7 @@
 			break;
 		default: RAISE("%d bytes/pixel: how do I deal with that?",f->BytesPerPixel); break;
 		}
-		_0_title(0,0,string("GridFlow SDL"));
+		_0_title(string("GridFlow SDL"));
 	}
 	\grin 0 int
 	~FormatSDL () {

Modified: trunk/src/source_filter.rb
==============================================================================
--- trunk/src/source_filter.rb (original)
+++ trunk/src/source_filter.rb Wed May 12 18:06:35 2010
@@ -137,8 +137,9 @@
 	if /^\{/ =~ m.continue
 	  handle_def(line,true)
 	else
-	  Out.print "#{m.rettype} #{m.selector}(VA"
-	  Out.print ", #{unparse_args m.args}" if m.args.length>0
+	  Out.print "#{m.rettype} #{m.selector}("
+	  Out.print "VA" if m.maxargs<0
+	  Out.print unparse_args m.args if m.args.length>0
 	  Out.print "); static void #{m.selector}_wrap(#{classname} *self, VA);"
 	end
 end
@@ -149,9 +150,10 @@
 end
 
 def pass_args(m)
+	if m.maxargs==-1 then Out.print "argc,argv" end
 	m.args.each_with_index{|arg,i|
-		if arg.default then Out.print ",argc<#{i+1}?#{arg.default}:"
-		else		    Out.print                            "," end
+		Out.print "," if i>0 or m.maxargs==-1
+		Out.print "argc<#{i+1}?#{arg.default}:" if arg.default
 		Out.print "convert(argv[#{i}],(#{arg.type}*)0)"
 	}
 	Out.print ");DEF_OUT;}"
@@ -182,12 +184,13 @@
 	Out.print "#{m.rettype} foo;" if m.rettype!="void"
 	check_argc m
 	Out.print "foo = " if m.rettype!="void"
-	Out.print " self->#{m.selector}(argc,argv"
+	Out.print " self->#{m.selector}("
 	pass_args m
 	Out.print m.rettype+" "
 	Out.print "#{classname}::" unless in_class_block
-	Out.print m.selector+"(VA"
-	Out.print ","+unparse_args(n.args,false) if m.args.length>0
+	Out.print m.selector+"("
+	Out.print "VA" if m.maxargs<0
+	Out.print unparse_args(n.args,false) if m.args.length>0
 	Out.print ")#{term} "
 	qlass.methods[m.selector].done=true
 end
@@ -199,9 +202,12 @@
 	Out.print "#{frame.name}(BFObject *bself, MESSAGE) : #{frame.supername}(bself,MESSAGE2) {"
 	Out.print "DEF_IN(\"constructor\");"
 	check_argc m
-	Out.print "#{m.selector}(sel,argc,argv"
+	Out.print "#{m.selector}(sel"
+	Out.print "," if m.maxargs!=0
 	pass_args m
-	Out.print "#{m.rettype} #{m.selector}(MESSAGE"
+	#Out.print "/* m.maxargs = #{m.maxargs} */"
+	Out.print "#{m.rettype} #{m.selector}(t_symbol *sel"
+	Out.print ", VA" if m.maxargs<0
 	Out.print ", #{unparse_args m.args}" if m.args.length>0
 	Out.print ") "+line[/\{.*/]
 end
@@ -213,7 +219,7 @@
 	Out.print "CLASSINFO(#{cl})"
 	get="void ___get(t_symbol *s=0) {t_atom a[1];"
 	frame.attrs.each {|name,attr|
-		virtual = if attr.virtual then "(0,0)" else "" end
+		virtual = if attr.virtual then "()" else "" end
 		get << "if (s==gensym(\"#{name}\")) set_atom(a,#{name}#{virtual}); else "
 		next if frame.methods["_0_"+name].done
 		type,name,default = attr.to_a

Modified: trunk/src/v4l2.cxx
==============================================================================
--- trunk/src/v4l2.cxx (original)
+++ trunk/src/v4l2.cxx Wed May 12 18:06:35 2010
@@ -158,15 +158,15 @@
 		//WIOCTL(fd, VIDIOCGCAP, &cap);
 		WIOCTL(fd, VIDIOC_QUERYCAP, &cap);
 		//_0_size(0,0,cap.maxheight,cap.maxwidth);
-		_0_size(0,0,240,320);
+		_0_size(240,320);
 		t_symbol *card = safe_gensym((char *)cap.card,sizeof(cap.card));
 		//t_symbol *bus = safe_gensym((char *)cap.bus_info,sizeof(cap.bus_info));
 		//this->name = symprintf("%s_on_%s",card->s_name,bus->s_name);
 		this->name = card;
 		//WIOCTL(fd, VIDIOCGPICT,&vp);
 		//int checklist[] = {V4L2_PIX_FMT_RGB24,V4L2_PIX_FMT_YVU420};
-		_0_colorspace(0,0,gensym("rgb"));
-		_0_channel(0,0,0);
+		_0_colorspace(gensym("rgb"));
+		_0_channel(0);
 	}
 	void frame_finished (uint8 *buf);
 
@@ -203,7 +203,7 @@
 };
 
 \def 0 get (t_symbol *s=0) {
-	FObject::_0_get(argc,argv,s);
+	FObject::_0_get(s);
 	// size are abnormal attributes (does not use nested list)
 	if (!s) {
 		t_atom a[2];

Modified: trunk/src/videodev.cxx
==============================================================================
--- trunk/src/videodev.cxx (original)
+++ trunk/src/videodev.cxx Wed May 12 18:06:35 2010
@@ -235,9 +235,9 @@
 		name = safe_gensym(vcaps.name);
 		WIOCTL(fd, VIDIOCGPICT,&vp);
 		detect_palettes();
-		_0_size(0,0,vcaps.maxheight,vcaps.maxwidth);
-		_0_colorspace(0,0,gensym("rgb"));
-		_0_channel(0,0,0);
+		_0_size(vcaps.maxheight,vcaps.maxwidth);
+		_0_colorspace(gensym("rgb"));
+		_0_channel(0);
 	}
 	void frame_finished (uint8 *buf);
 
@@ -306,7 +306,7 @@
 	if (!use_pwc && (s==gensym("white_mode")      || s==gensym("white_red")   || s==gensym("white_blue") ||
 			 s==gensym("white_speed")     || s==gensym("white_delay") || s==gensym("auto_gain")  ||
 			 s==gensym("noise_reduction") || s==gensym("compression") || s==gensym("framerate"))) return;
-	FObject::_0_get(argc,argv,s);
+	FObject::_0_get(s);
 	// size are abnormal attributes (does not use nested list)
 	if (!s) {
 		t_atom a[2];
@@ -528,7 +528,7 @@
 	if (0> IOCTL(fd, VIDIOCGCHAN, &vchan)) warn("no channel #%d", value);
 	//gfpost(&vchan);
 	WIOCTL(fd, VIDIOCSCHAN, &vchan);
-	if (vcaps.type & VID_TYPE_TUNER) _0_tuner(0,0,0);
+	if (vcaps.type & VID_TYPE_TUNER) _0_tuner(0);
 	has_tuner = (vcaps.type & VID_TYPE_TUNER && vchan.tuners > 1);
 }
 \def int channel () {return current_channel;}

Modified: trunk/src/x11.cxx
==============================================================================
--- trunk/src/x11.cxx (original)
+++ trunk/src/x11.cxx Wed May 12 18:06:35 2010
@@ -208,9 +208,9 @@
 			Window root; int x,y; unsigned sx,sy,sb,depth;
 			XGetGeometry(display,window,&root,&x,&y,&sx,&sy,&sb,&depth);
 			post("sx=%d sy=%d",sx,sy);
-			_0_out_size(argc,argv,sy,sx);
-		}
-		_0_border(0,0,1);
+			_0_out_size(sy,sx);
+		}
+		_0_border(1);
 	}
 
 	\decl 0 bang ();



More information about the Gridflow-cvs mailing list