[Gridflow-cvs] [svn] commit: r3295 - in /trunk/format: aalib.c jpeg.c main.c mpeg3.c netpbm.c opengl.c png.c quartz.m quicktimeapple.c quicktimehw.c sdl.c videodev.c x11.c

gridflow-cvs at artengine.ca gridflow-cvs at artengine.ca
Tue Mar 25 20:29:28 EDT 2008


Author: matju
Date: Tue Mar 25 20:29:28 2008
New Revision: 3295

Log:
use SUPER macro

Modified:
    trunk/format/aalib.c
    trunk/format/jpeg.c
    trunk/format/main.c
    trunk/format/mpeg3.c
    trunk/format/netpbm.c
    trunk/format/opengl.c
    trunk/format/png.c
    trunk/format/quartz.m
    trunk/format/quicktimeapple.c
    trunk/format/quicktimehw.c
    trunk/format/sdl.c
    trunk/format/videodev.c
    trunk/format/x11.c

Modified: trunk/format/aalib.c
==============================================================================
--- trunk/format/aalib.c (original)
+++ trunk/format/aalib.c Tue Mar 25 20:29:28 2008
@@ -125,7 +125,7 @@
 
 /* !@#$ varargs missing here */
 \def void initialize (Symbol mode, Symbol target) {
-	rb_call_super(argc,argv);
+	SUPER;
 	argc-=2; argv+=2;
 	char *argv2[argc];
 	for (int i=0; i<argc; i++)

Modified: trunk/format/jpeg.c
==============================================================================
--- trunk/format/jpeg.c (original)
+++ trunk/format/jpeg.c Tue Mar 25 20:29:28 2008
@@ -121,7 +121,7 @@
 }
 
 \def void initialize (Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	rb_funcall(rself,SI(raw_open),3,mode,filename);
 	Ruby stream = rb_ivar_get(rself,SI(@stream));
 	fd = NUM2INT(rb_funcall(stream,SI(fileno),0));

Modified: trunk/format/main.c
==============================================================================
--- trunk/format/main.c (original)
+++ trunk/format/main.c Tue Mar 25 20:29:28 2008
@@ -54,7 +54,7 @@
 };
 
 \def void initialize(Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	strncpy(head.magic,is_le()?"\7fgrid":"\7fGRID",5);
 	head.type = 32;
 	rb_funcall(rself,SI(raw_open),3,mode,filename);

Modified: trunk/format/mpeg3.c
==============================================================================
--- trunk/format/mpeg3.c (original)
+++ trunk/format/mpeg3.c Tue Mar 25 20:29:28 2008
@@ -65,15 +65,13 @@
 }
 
 \def 0 close () {
-//	fprintf(stderr, "begin mpeg3_close...\n");
 	if (mpeg) { mpeg3_close(mpeg); mpeg=0; }
-	rb_call_super(argc,argv);
-//	fprintf(stderr, "end mpeg3_close...\n");
+	SUPER;
 }
 
 // libmpeg3 may be nice, but it won't take a filehandle, only filename
 \def void initialize (Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	if (mode!=SYM(in)) RAISE("read-only, sorry");
 	if (TYPE(filename)!=T_STRING) RAISE("PATATE POILUE");
 	filename = rb_funcall(mGridFlow,SI(find_file),1,filename);

Modified: trunk/format/netpbm.c
==============================================================================
--- trunk/format/netpbm.c (original)
+++ trunk/format/netpbm.c Tue Mar 25 20:29:28 2008
@@ -35,7 +35,7 @@
 	\decl 0 bang ();
 };
 \def void initialize(Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	rb_funcall(rself,SI(raw_open),3,mode,filename);
 	Ruby stream = rb_ivar_get(rself,SI(@stream));
 	fd = NUM2INT(rb_funcall(stream,SI(fileno),0));

Modified: trunk/format/opengl.c
==============================================================================
--- trunk/format/opengl.c (original)
+++ trunk/format/opengl.c Tue Mar 25 20:29:28 2008
@@ -144,7 +144,7 @@
 }
 
 \def void initialize (Symbol mode) {
-	rb_call_super(argc,argv);
+	SUPER;
 	if (in_use) RAISE("only one #io:opengl object at a time; sorry");
 	in_use=true;
 	if (mode!=SYM(out)) RAISE("write-only, sorry");

Modified: trunk/format/png.c
==============================================================================
--- trunk/format/png.c (original)
+++ trunk/format/png.c Tue Mar 25 20:29:28 2008
@@ -112,7 +112,7 @@
 \def 0 close () {if (f) {fclose(f); f=0;}}
 
 \def void initialize (Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	rb_funcall(rself,SI(raw_open),3,mode,filename);
 	Ruby stream = rb_ivar_get(rself,SI(@stream));
 	fd = NUM2INT(rb_funcall(stream,SI(fileno),0));

Modified: trunk/format/quartz.m
==============================================================================
--- trunk/format/quartz.m (original)
+++ trunk/format/quartz.m Tue Mar 25 20:29:28 2008
@@ -183,7 +183,7 @@
 } GRID_END
 
 \def void initialize (Symbol mode) {
-	rb_call_super(argc,argv);
+	SUPER;
 	NSRect r = {{0,0}, {320,240}};
 	window = [[NSWindow alloc]
 		initWithContentRect: r
@@ -212,7 +212,7 @@
 
 \def 0 close () {
 	IEVAL(rself,"@clock.unset");
-	rb_call_super(argc,argv);
+	SUPER;
 	[window autorelease];
 	[window setReleasedWhenClosed: YES];
 	[window close];

Modified: trunk/format/quicktimeapple.c
==============================================================================
--- trunk/format/quicktimeapple.c (original)
+++ trunk/format/quicktimeapple.c Tue Mar 25 20:29:28 2008
@@ -203,7 +203,7 @@
 
 \def void initialize (Symbol mode, String filename) {
 //vdc = SGGetVideoDigitizerComponent(c);
-  rb_call_super(argc,argv);
+  SUPER;
   dim = new Dim(240,320,4);
   OSErr e;
   rect.top=rect.left=0;
@@ -422,12 +422,12 @@
 		CloseMovieFile(movie_file);
 		movie_file=0;
 	}
-	rb_call_super(argc,argv);
+	SUPER;
 }
 
 \def void initialize (Symbol mode, String filename) {
 	int err;
-	rb_call_super(argc,argv);
+	SUPER;
 	filename = rb_funcall(mGridFlow,SI(find_file),1,filename);
 	FSSpec fss;
 	FSRef fsr;

Modified: trunk/format/quicktimehw.c
==============================================================================
--- trunk/format/quicktimehw.c (original)
+++ trunk/format/quicktimehw.c Tue Mar 25 20:29:28 2008
@@ -170,7 +170,7 @@
 
 \def 0 close () {
 	if (anim) { quicktime_close(anim); anim=0; }
-	rb_call_super(argc,argv);
+	SUPER;
 }
 
 \def 0 get () {
@@ -180,12 +180,12 @@
 */
 	Ruby a[] = {INT2NUM(1),SYM(frames),INT2NUM(length)};
 	send_out(3,a);
-	//rb_call_super(argc,argv);
+	//SUPER;
 }
 
 // libquicktime may be nice, but it won't take a filehandle, only filename
 \def void initialize (Symbol mode, String filename) {
-	rb_call_super(argc,argv);
+	SUPER;
 	filename = rb_funcall(mGridFlow,SI(find_file),1,filename);
 	anim = quicktime_open(rb_str_ptr(filename),mode==SYM(in),mode==SYM(out));
 	if (!anim) RAISE("can't open file `%s': %s (or some other reason that libquicktime won't tell us)",

Modified: trunk/format/sdl.c
==============================================================================
--- trunk/format/sdl.c (original)
+++ trunk/format/sdl.c Tue Mar 25 20:29:28 2008
@@ -87,7 +87,7 @@
 
 \def void initialize (Symbol mode) {
 	dim=0;screen=0;
-	rb_call_super(argc,argv);
+	SUPER;
 	if (in_use) RAISE("only one FormatSDL object at a time; sorry");
 	in_use=true;
 	if (SDL_Init(SDL_INIT_VIDEO)<0)

Modified: trunk/format/videodev.c
==============================================================================
--- trunk/format/videodev.c (original)
+++ trunk/format/videodev.c Tue Mar 25 20:29:28 2008
@@ -575,7 +575,7 @@
 
 \def 0 close () {
 	if (image) rb_funcall(rself,SI(dealloc_image),0);
-	rb_call_super(argc,argv);
+	SUPER;
 }
 
 \def 0 colorspace (Symbol c) { /* y yuv rgb */
@@ -749,7 +749,7 @@
 }
 
 \def void initialize (Symbol mode, String filename, Symbol option=Qnil) {
-	rb_call_super(argc,argv);
+	SUPER;
 	image=0;
 	rb_ivar_set(rself,SI(@stream),
 		rb_funcall(rb_cFile,SI(open),2,filename,rb_str_new2("r+")));

Modified: trunk/format/x11.c
==============================================================================
--- trunk/format/x11.c (original)
+++ trunk/format/x11.c Tue Mar 25 20:29:28 2008
@@ -426,7 +426,7 @@
 	dealloc_image();
 	XCloseDisplay(display);
 	display=0;
-	rb_call_super(argc,argv);
+	SUPER;
 }
 
 \def 0 out_size (int sy, int sx) { resize_window(sx,sy); }
@@ -560,7 +560,7 @@
 
 \def void initialize (...) {
 	int sy=240, sx=320; // defaults
-	rb_call_super(argc,argv);
+	SUPER;
 	rb_ivar_set(rself,SI(@title),Qnil);
 	argv++, argc--;
 	VALUE domain = argc<1 ? SYM(here) : argv[0];



More information about the Gridflow-cvs mailing list