Update of /cvsroot/playerstage/code/player/server/drivers/ptz
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/ptz
Modified Files:
amtecpowercube.cc canonvcc4.cc ptu46.cc sonyevid30.cc
Log Message:
applied Toby's autopointer patches
Index: ptu46.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/ptz/ptu46.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** ptu46.cc 20 Aug 2007 06:37:30 -0000 1.22
--- ptu46.cc 23 Aug 2007 19:58:47 -0000 1.23
***************
*** 554,558 ****
// MessageHandler
! int ProcessMessage (MessageQueue* resp_queue, player_msghdr * hdr, void
* data);
};
--- 554,558 ----
// MessageHandler
! int ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr, void
* data);
};
***************
*** 630,634 ****
////////////////////////////////////////////////////////////////////////////////
int
! PTU46_Device::ProcessMessage (MessageQueue * resp_queue, player_msghdr * hdr,
void * data)
{
assert (hdr);
--- 630,634 ----
////////////////////////////////////////////////////////////////////////////////
int
! PTU46_Device::ProcessMessage (QueuePointer &resp_queue, player_msghdr * hdr,
void * data)
{
assert (hdr);
***************
*** 753,757 ****
data.tiltspeed = DTOR (pantilt->GetSpeed (PTU46_TILT));
! Publish (device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data, sizeof (player_ptz_data_t), NULL);
--- 753,757 ----
data.tiltspeed = DTOR (pantilt->GetSpeed (PTU46_TILT));
! Publish (device_addr, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data, sizeof (player_ptz_data_t), NULL);
Index: canonvcc4.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/ptz/canonvcc4.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** canonvcc4.cc 1 Mar 2007 20:41:47 -0000 1.12
--- canonvcc4.cc 23 Aug 2007 19:58:47 -0000 1.13
***************
*** 89,93 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr * hdr, void *
data);
// int ProcessMessage(ClientData * client, player_msghdr * hdr, uint8_t *
data, uint8_t * resp_data, int * resp_len);
--- 89,93 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
// int ProcessMessage(ClientData * client, player_msghdr * hdr, uint8_t *
data, uint8_t * resp_data, int * resp_len);
***************
*** 861,865 ****
pthread_testcancel();
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data,sizeof(player_ptz_data_t),NULL);
usleep(PTZ_SLEEP_TIME_USEC);
--- 861,865 ----
pthread_testcancel();
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data,sizeof(player_ptz_data_t),NULL);
usleep(PTZ_SLEEP_TIME_USEC);
***************
*** 867,871 ****
}
! int canonvcc4::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr,
void * data)
{
assert(hdr);
--- 867,871 ----
}
! int canonvcc4::ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr,
void * data)
{
assert(hdr);
Index: amtecpowercube.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/ptz/amtecpowercube.cc,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** amtecpowercube.cc 20 Aug 2007 06:37:30 -0000 1.20
--- amtecpowercube.cc 23 Aug 2007 19:58:47 -0000 1.21
***************
*** 213,217 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr * hdr, void *
data);
virtual int Setup();
--- 213,217 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
virtual int Setup();
***************
*** 999,1003 ****
! int AmtecPowerCube::ProcessMessage(MessageQueue * resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
--- 999,1003 ----
! int AmtecPowerCube::ProcessMessage(QueuePointer &resp_queue, player_msghdr *
hdr, void * data)
{
assert(hdr);
***************
*** 1152,1156 ****
data.tiltspeed = (currtiltspeed);
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
(unsigned char*)&data, sizeof(player_ptz_data_t),NULL);
// get the module state (for debugging and warning)
--- 1152,1156 ----
data.tiltspeed = (currtiltspeed);
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
(unsigned char*)&data, sizeof(player_ptz_data_t),NULL);
// get the module state (for debugging and warning)
Index: sonyevid30.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/server/drivers/ptz/sonyevid30.cc,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** sonyevid30.cc 20 Aug 2007 06:37:30 -0000 1.27
--- sonyevid30.cc 23 Aug 2007 19:58:47 -0000 1.28
***************
*** 470,475 ****
// MessageHandler
! int ProcessMessage(MessageQueue* resp_queue, player_msghdr * hdr, void *
data);
! int ProcessGenericRequest(MessageQueue * resp_queue,
player_msghdr *hdr,
player_ptz_req_generic_t *req);
--- 470,475 ----
// MessageHandler
! int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, void *
data);
! int ProcessGenericRequest(QueuePointer &resp_queue,
player_msghdr *hdr,
player_ptz_req_generic_t *req);
***************
*** 1267,1271 ****
}
! int SonyEVID30::ProcessGenericRequest(MessageQueue *resp_queue,
player_msghdr *hdr,
player_ptz_req_generic_t *req)
--- 1267,1271 ----
}
! int SonyEVID30::ProcessGenericRequest(QueuePointer &resp_queue,
player_msghdr *hdr,
player_ptz_req_generic_t *req)
***************
*** 1376,1380 ****
}
! int SonyEVID30::ProcessMessage(MessageQueue * resp_queue,
player_msghdr * hdr,
void *data)
{
--- 1376,1380 ----
}
! int SonyEVID30::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void *data)
{
***************
*** 1518,1522 ****
/* test if we are supposed to cancel */
pthread_testcancel();
! Publish(device_addr, NULL, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data,sizeof(player_ptz_data_t),NULL);
usleep(PTZ_SLEEP_TIME_USEC);
--- 1518,1522 ----
/* test if we are supposed to cancel */
pthread_testcancel();
! Publish(device_addr, PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
&data,sizeof(player_ptz_data_t),NULL);
usleep(PTZ_SLEEP_TIME_USEC);
-------------------------------------------------------------------------
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
