[Okvm-cvs] okvm/server V4LDesktop.cpp,1.2,1.3 V4LDesktop.h,1.2,1.3

[David M. <da...@us...>]

Update of /cvsroot/okvm/okvm/server
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv5250/server

Modified Files:
	V4LDesktop.cpp V4LDesktop.h 
Log Message:

Fixup palette handling so the we work with devices other than the okvm
hardware.

Scott Burns <sb...@ii...>



Index: V4LDesktop.h
===================================================================
RCS file: /cvsroot/okvm/okvm/server/V4LDesktop.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** V4LDesktop.h	5 Nov 2005 10:59:53 -0000	1.2
--- V4LDesktop.h	24 May 2006 06:57:07 -0000	1.3
***************
*** 57,60 ****
--- 57,61 ----
  	int width;
  	int height;
+ 	int palette;
  	void* framebuffer;
  };

Index: V4LDesktop.cpp
===================================================================
RCS file: /cvsroot/okvm/okvm/server/V4LDesktop.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** V4LDesktop.cpp	5 Nov 2005 10:59:53 -0000	1.2
--- V4LDesktop.cpp	24 May 2006 06:57:07 -0000	1.3
***************
*** 96,99 ****
--- 96,100 ----
  	v4lioctl(fd, VIDIOCGPICT, &vp);
  	v4lioctl(fd, VIDIOCSPICT, &vp);
+ 	palette = vp.palette;
  	switch (vp.palette) {
  	case VIDEO_PALETTE_RGB565:
***************
*** 208,211 ****
--- 209,213 ----
  	vm.width = width;
  	vm.height = height;
+ 	vm.format = palette;
  	
  	v4lioctl(fd, VIDIOCMCAPTURE, &vm);