Update of /cvsroot/playerstage/code/player/server/drivers/mixed/cmucam2
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/server/drivers/mixed/cmucam2
Modified Files:
camera.h cmucam2.cc
Log Message:
overhaul of the player interface definitions
interfaces are now defined with a very light weight IDL allowing them to be
edited in a single file
some subtype names were also modified as a side effect, making them more
consistent globally
Index: cmucam2.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/cmucam2/cmucam2.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** cmucam2.cc 21 Jun 2007 07:28:33 -0000 1.17
--- cmucam2.cc 20 Aug 2007 06:37:28 -0000 1.18
***************
*** 330,348 ****
}
! if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
! PLAYER_PTZ_REQ_AUTOSERVO, ptz_id))
! {
! player_ptz_req_control_mode *servo =
(player_ptz_req_control_mode*)data;
! auto_servoing (fd, servo->mode);
! if(servo->mode)
! PLAYER_MSG0 (1, "Auto servoing is enabled.");
! else
! PLAYER_MSG0 (1, "Auto servoing is disabled.");
!
! Publish (this->ptz_id, resp_queue,
! PLAYER_MSGTYPE_RESP_ACK,
! PLAYER_PTZ_REQ_AUTOSERVO);
! return PLAYER_MSGTYPE_RESP_ACK;
! }
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
--- 330,348 ----
}
! // if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
! // PLAYER_PTZ_REQ_AUTOSERVO, ptz_id))
! // {
! // player_ptz_req_control_mode *servo =
(player_ptz_req_control_mode*)data;
! // auto_servoing (fd, servo->mode);
! // if(servo->mode)
! // PLAYER_MSG0 (1, "Auto servoing is enabled.");
! // else
! // PLAYER_MSG0 (1, "Auto servoing is disabled.");
! //
! // Publish (this->ptz_id, resp_queue,
! // PLAYER_MSGTYPE_RESP_ACK,
! // PLAYER_PTZ_REQ_AUTOSERVO);
! // return PLAYER_MSGTYPE_RESP_ACK;
! // }
if (Message::MatchMessage(hdr, PLAYER_MSGTYPE_REQ,
Index: camera.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/cmucam2/camera.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** camera.h 27 Feb 2006 00:57:31 -0000 1.4
--- camera.h 20 Aug 2007 06:37:28 -0000 1.5
***************
*** 89,93 ****
typedef struct // camera's internal register controlling image
quality
{
! uint8_t subtype; // must be PLAYER_BLOBFINDER_SET_IMAGER_PARAMS_REQ.
int16_t brightness; // contrast: -1 = no change. (0-255)
int16_t contrast; // brightness: -1 = no change. (0-255)
--- 89,93 ----
typedef struct // camera's internal register controlling image
quality
{
! uint8_t subtype; // must be PLAYER_BLOBFINDER_REQ_SET_IMAGER_PARAMS.
int16_t brightness; // contrast: -1 = no change. (0-255)
int16_t contrast; // brightness: -1 = no change. (0-255)
***************
*** 107,111 ****
typedef struct
{
! uint8_t subtype; // must be
PLAYER_BLOBFINDER_SET_COLOR_REQ.
int16_t rmin, rmax; // RGB minimum and max values (0-255)
int16_t gmin, gmax;
--- 107,111 ----
typedef struct
{
! uint8_t subtype; // must be
PLAYER_BLOBFINDER_REQ_SET_COLOR.
int16_t rmin, rmax; // RGB minimum and max values (0-255)
int16_t gmin, gmax;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
