Update of /cvsroot/playerstage/code/player/server/drivers/camera/sphere
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27174/server/drivers/camera/sphere
Modified Files:
Tag: release-2-0-patches
setpwc_api.c setpwc_api.h
Log Message:
merged driver changes from HEAD
Index: setpwc_api.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/sphere/setpwc_api.h,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** setpwc_api.h 2 Sep 2005 17:51:45 -0000 1.1
--- setpwc_api.h 24 Apr 2007 22:20:20 -0000 1.1.4.1
***************
*** 45,49 ****
void dump_current_settings(int fd);
! void query_pan_tilt_status(int fd);
void reset_pan_tilt(int fd, int what);
--- 45,49 ----
void dump_current_settings(int fd);
! void query_pan_tilt_status(int fd, int *status);
void reset_pan_tilt(int fd, int what);
***************
*** 53,56 ****
--- 53,58 ----
void set_pan_or_tilt(int fd, char what, int value);
+ void set_pan_and_tilt(int fd, int pan, int tilt);
+
void set_framerate(int fd, int framerate);
Index: setpwc_api.c
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/sphere/setpwc_api.c,v
retrieving revision 1.1
retrieving revision 1.1.4.1
diff -C2 -d -r1.1 -r1.1.4.1
*** setpwc_api.c 2 Sep 2005 17:51:45 -0000 1.1
--- setpwc_api.c 24 Apr 2007 22:20:20 -0000 1.1.4.1
***************
*** 229,233 ****
! void query_pan_tilt_status(fd)
{
struct pwc_mpt_status pms;
--- 229,233 ----
! void query_pan_tilt_status(int fd, int *status)
{
struct pwc_mpt_status pms;
***************
*** 236,242 ****
error_exit("VIDIOCPWCMPTSTATUS");
! printf("Status: %d\n", pms.status);
! printf("Time pan: %d\n", pms.time_pan);
! printf("Time tilt: %d\n", pms.time_tilt);
}
--- 236,240 ----
error_exit("VIDIOCPWCMPTSTATUS");
! *status = pms.status;
}
***************
*** 264,267 ****
--- 262,280 ----
}
+ void set_pan_and_tilt(int fd, int pan, int tilt)
+ {
+ struct pwc_mpt_angles pma;
+
+ pma.absolute=1;
+ if (ioctl(fd, VIDIOCPWCMPTGANGLE, &pma) == -1)
+ error_exit("VIDIOCPWCMPTGANGLE");
+
+ pma.pan = pan;
+ pma.tilt = tilt;
+
+ if (ioctl(fd, VIDIOCPWCMPTSANGLE, &pma) == -1)
+ error_exit("VIDIOCPWCMPTSANGLE");
+ }
+
void get_pan_or_tilt_limits(int fd, char what, int *min, int *max)
{
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
