Update of /cvsroot/playerstage/code/player/server/drivers/camera/sphere
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/camera/sphere
Modified Files:
sphere_mixed.cc sphere_mixed.h
Log Message:
applied Toby's autopointer patches
Index: sphere_mixed.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/sphere/sphere_mixed.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** sphere_mixed.h 5 Sep 2005 14:19:42 -0000 1.2
--- sphere_mixed.h 23 Aug 2007 19:58:43 -0000 1.3
***************
*** 49,53 ****
// This method will be invoked on each incoming message
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 49,53 ----
// This method will be invoked on each incoming message
! virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
Index: sphere_mixed.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/sphere/sphere_mixed.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** sphere_mixed.cc 20 Nov 2006 16:53:47 -0000 1.10
--- sphere_mixed.cc 23 Aug 2007 19:58:43 -0000 1.11
***************
*** 417,425 ****
// Process an incoming message
! int SphereDriver::ProcessMessage(MessageQueue* resp_queue,
player_msghdr* hdr,
void* data)
{
- assert(resp_queue);
assert(hdr);
assert(data);
--- 417,424 ----
// Process an incoming message
! int SphereDriver::ProcessMessage(QueuePointer & resp_queue,
player_msghdr* hdr,
void* data)
{
assert(hdr);
assert(data);
***************
*** 520,528 ****
size = sizeof(mCameraData) - sizeof(mCameraData.image) + image_size;
! Publish(mCameraAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
reinterpret_cast<void*>(&mCameraData), size, NULL);
! Publish(mPtzAddr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
reinterpret_cast<void*>(&mPtzData), sizeof(mPtzData), NULL);
--- 519,527 ----
size = sizeof(mCameraData) - sizeof(mCameraData.image) + image_size;
! Publish(mCameraAddr,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
reinterpret_cast<void*>(&mCameraData), size, NULL);
! Publish(mPtzAddr,
PLAYER_MSGTYPE_DATA, PLAYER_PTZ_DATA_STATE,
reinterpret_cast<void*>(&mPtzData), sizeof(mPtzData), NULL);
-------------------------------------------------------------------------
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
