[Mplayer-cvslog] CVS: main/libvo vo_fbdev.c,1.34,1.35

[Szabolcs Berecz]

Update of /cvsroot/mplayer/main/libvo
In directory usw-pr-cvs1:/tmp/cvs-serv18175

Modified Files:
	vo_fbdev.c 
Log Message:
some cleanup

Index: vo_fbdev.c
===================================================================
RCS file: /cvsroot/mplayer/main/libvo/vo_fbdev.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** vo_fbdev.c	2001/04/24 11:42:04	1.34
--- vo_fbdev.c	2001/04/24 12:23:08	1.35
***************
*** 786,793 ****
--- 786,799 ----
  		return 1;
  	}
+ 	if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo)) {
+ 		printf(FBDEV "Can't get FSCREENINFO: %s\n", strerror(errno));
+ 		return 1;
+ 	}
+ #if 0
  	if (ioctl(fb_dev_fd, FBIOGET_VSCREENINFO, &fb_vinfo)) {
  		printf(FBDEV "Can't get VSCREENINFO: %s\n", strerror(errno));
  		return 1;
  	}
+ #endif
  
  	if (verbose > 0) {
***************
*** 834,859 ****
  			printf(FBDEV "vmode: %u\n", fb_vinfo.vmode);
  		}
- 	}
- 	if (ioctl(fb_dev_fd, FBIOGET_FSCREENINFO, &fb_finfo)) {
- 		printf(FBDEV "Can't get FSCREENINFO: %s\n", strerror(errno));
- 		return 1;
- 	}
- 	if (verbose > 0) {
  		printf(FBDEV "fix info:\n");
- 		if (verbose > 1) {
- 			printf(FBDEV "id: %.16s\n", fb_finfo.id);
- 			printf(FBDEV "smem_start: %p\n", (void *) fb_finfo.smem_start);
- 		}
  		printf(FBDEV "framebuffer size: %d bytes\n", fb_finfo.smem_len);
  		printf(FBDEV "type: %lu\n", (unsigned long) fb_finfo.type);
  		printf(FBDEV "type_aux: %lu\n", (unsigned long) fb_finfo.type_aux);
  		printf(FBDEV "visual: %lu\n", (unsigned long) fb_finfo.visual);
  		if (verbose > 1) {
  			printf(FBDEV "xpanstep: %u\n", fb_finfo.xpanstep);
  			printf(FBDEV "ypanstep: %u\n", fb_finfo.ypanstep);
  			printf(FBDEV "ywrapstep: %u\n", fb_finfo.ywrapstep);
- 		}
- 		printf(FBDEV "line_length: %lu bytes\n", (unsigned long) fb_finfo.line_length);
- 		if (verbose > 1) {
  			printf(FBDEV "mmio_start: %p\n", (void *) fb_finfo.mmio_start);
  			printf(FBDEV "mmio_len: %u bytes\n", fb_finfo.mmio_len);
--- 840,855 ----
  			printf(FBDEV "vmode: %u\n", fb_vinfo.vmode);
  		}
  		printf(FBDEV "fix info:\n");
  		printf(FBDEV "framebuffer size: %d bytes\n", fb_finfo.smem_len);
  		printf(FBDEV "type: %lu\n", (unsigned long) fb_finfo.type);
  		printf(FBDEV "type_aux: %lu\n", (unsigned long) fb_finfo.type_aux);
  		printf(FBDEV "visual: %lu\n", (unsigned long) fb_finfo.visual);
+ 		printf(FBDEV "line_length: %lu bytes\n", (unsigned long) fb_finfo.line_length);
  		if (verbose > 1) {
+ 			printf(FBDEV "id: %.16s\n", fb_finfo.id);
+ 			printf(FBDEV "smem_start: %p\n", (void *) fb_finfo.smem_start);
  			printf(FBDEV "xpanstep: %u\n", fb_finfo.xpanstep);
  			printf(FBDEV "ypanstep: %u\n", fb_finfo.ypanstep);
  			printf(FBDEV "ywrapstep: %u\n", fb_finfo.ywrapstep);
  			printf(FBDEV "mmio_start: %p\n", (void *) fb_finfo.mmio_start);
  			printf(FBDEV "mmio_len: %u bytes\n", fb_finfo.mmio_len);
***************
*** 861,864 ****
--- 857,861 ----
  		}
  	}
+ 
  	switch (fb_finfo.type) {
  		case FB_TYPE_VGA_PLANES:
***************
*** 885,888 ****
--- 882,886 ----
  			return 1;
  	}
+ 
  	switch (fb_finfo.visual) {
  		case FB_VISUAL_TRUECOLOR:
***************
*** 918,921 ****
--- 916,920 ----
  			return 1;
  	}
+ 
  	if (FS || (d_width && VM)) {
  		out_width = fb_vinfo.xres;


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog