Update of /cvsroot/playerstage/code/player/server/drivers/camera/1394
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/camera/1394
Modified Files:
camera1394.cc
Log Message:
applied Toby's autopointer patches
Index: camera1394.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/camera/1394/camera1394.cc,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** camera1394.cc 20 Aug 2007 06:37:27 -0000 1.33
--- camera1394.cc 23 Aug 2007 19:58:43 -0000 1.34
***************
*** 282,286 ****
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 282,286 ----
// This method will be invoked on each incoming message
! public: virtual int ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 1080,1088 ****
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int Camera1394::ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
{
- assert(resp_queue);
assert(hdr);
assert(data);
--- 1080,1087 ----
////////////////////////////////////////////////////////////////////////////////
// Process an incoming message
! int Camera1394::ProcessMessage(QueuePointer & resp_queue,
player_msghdr * hdr,
void * data)
{
assert(hdr);
assert(data);
***************
*** 1355,1359 ****
/* We should do this to be efficient */
! Publish(this->device_addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
reinterpret_cast<void*>(&this->data), size, NULL);
--- 1354,1358 ----
/* We should do this to be efficient */
! Publish(this->device_addr,
PLAYER_MSGTYPE_DATA, PLAYER_CAMERA_DATA_STATE,
reinterpret_cast<void*>(&this->data), size, 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
