Update of /cvsroot/playerstage/code/player/server/drivers/mixed/cmucam2
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/cmucam2
Modified Files:
cmucam2.cc
Log Message:
applied Toby's autopointer patches
Index: cmucam2.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/cmucam2/cmucam2.cc,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** cmucam2.cc 20 Aug 2007 06:37:28 -0000 1.18
--- cmucam2.cc 23 Aug 2007 19:58:45 -0000 1.19
***************
*** 163,167 ****
// Process incoming messages from clients
! virtual int ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void * data);
--- 163,167 ----
// Process incoming messages from clients
! virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 297,301 ****
////////////////////////////////////////////////////////////////////////////////
! int Cmucam2::ProcessMessage (MessageQueue* resp_queue,
player_msghdr *
hdr,
void * data)
--- 297,301 ----
////////////////////////////////////////////////////////////////////////////////
! int Cmucam2::ProcessMessage (QueuePointer & resp_queue,
player_msghdr *
hdr,
void * data)
***************
*** 463,467 ****
/* got the data. now fill it in */
! Publish (this->blobfinder_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS, &blobfinder_data,
sizeof (player_blobfinder_data), NULL);
--- 463,467 ----
/* got the data. now fill it in */
! Publish (this->blobfinder_id, PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS, &blobfinder_data,
sizeof (player_blobfinder_data), NULL);
***************
*** 486,490 ****
ptz_data.tilt = ptz_data.tilt;
! Publish (this->ptz_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_PTZ_DATA_STATE,
&ptz_data, sizeof (player_ptz_data_t), NULL);
--- 486,490 ----
ptz_data.tilt = ptz_data.tilt;
! Publish (this->ptz_id, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&ptz_data, sizeof (player_ptz_data_t), NULL);
***************
*** 512,516 ****
free(camera_packet);
! Publish (this->cam_id, NULL, PLAYER_MSGTYPE_DATA,
PLAYER_CAMERA_DATA_STATE,
&cam_data, sizeof (player_camera_data_t), NULL);
return;
--- 512,516 ----
free(camera_packet);
! Publish (this->cam_id, PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
&cam_data, sizeof (player_camera_data_t), NULL);
return;
-------------------------------------------------------------------------
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
