Update of /cvsroot/playerstage/code/player/server/drivers/mixed/erratic
In directory 
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/player/server/drivers/mixed/erratic

Modified Files:
        erratic.cc erratic.h 
Log Message:
applied Toby's autopointer patches

Index: erratic.cc
===================================================================
RCS file: 
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/erratic.cc,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** erratic.cc  20 Aug 2007 06:37:28 -0000      1.15
--- erratic.cc  23 Aug 2007 19:58:45 -0000      1.16
***************
*** 1055,1059 ****
  // Publishes the indicated interface data
  void Erratic::PublishPosition2D() {
!       this->Publish(this->position_id, NULL,
                PLAYER_MSGTYPE_DATA,
                PLAYER_POSITION2D_DATA_STATE,
--- 1055,1059 ----
  // Publishes the indicated interface data
  void Erratic::PublishPosition2D() {
!       this->Publish(this->position_id,
                PLAYER_MSGTYPE_DATA,
                PLAYER_POSITION2D_DATA_STATE,
***************
*** 1063,1067 ****
  }
  void Erratic::PublishPower() {
!       this->Publish(this->power_id, NULL,
                PLAYER_MSGTYPE_DATA,
                PLAYER_POWER_DATA_STATE,
--- 1063,1067 ----
  }
  void Erratic::PublishPower() {
!       this->Publish(this->power_id,
                PLAYER_MSGTYPE_DATA,
                PLAYER_POWER_DATA_STATE,
***************
*** 1071,1075 ****
  }
  void Erratic::PublishAIn() {
!       this->Publish(this->aio_id, NULL,
                PLAYER_MSGTYPE_DATA,
                PLAYER_AIO_DATA_STATE,
--- 1071,1075 ----
  }
  void Erratic::PublishAIn() {
!       this->Publish(this->aio_id,
                PLAYER_MSGTYPE_DATA,
                PLAYER_AIO_DATA_STATE,
***************
*** 1079,1083 ****
  }
  void Erratic::PublishIR() {
!       this->Publish(this->ir_id, NULL,
                PLAYER_MSGTYPE_DATA,
                PLAYER_IR_DATA_RANGES,
--- 1079,1083 ----
  }
  void Erratic::PublishIR() {
!       this->Publish(this->ir_id,
                PLAYER_MSGTYPE_DATA,
                PLAYER_IR_DATA_RANGES,
***************
*** 1094,1098 ****
  
  // Gets called from ProcessMessages to handle one message
! int Erratic::ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, 
void * data) {
        // Look for configuration requests
        if(hdr->type == PLAYER_MSGTYPE_REQ)
--- 1094,1098 ----
  
  // Gets called from ProcessMessages to handle one message
! int Erratic::ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, 
void * data) {
        // Look for configuration requests
        if(hdr->type == PLAYER_MSGTYPE_REQ)
***************
*** 1105,1109 ****
  
  // Handles one Player command with a configuration request
! int Erratic::HandleConfig(MessageQueue* resp_queue, player_msghdr * hdr, void 
* data) {
  
        // check for position config requests
--- 1105,1109 ----
  
  // Handles one Player command with a configuration request
! int Erratic::HandleConfig(QueuePointer &resp_queue, player_msghdr * hdr, void 
* data) {
  
        // check for position config requests

Index: erratic.h
===================================================================
RCS file: 
/cvsroot/playerstage/code/player/server/drivers/mixed/erratic/erratic.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** erratic.h   18 Dec 2006 07:38:20 -0000      1.8
--- erratic.h   23 Aug 2007 19:58:45 -0000      1.9
***************
*** 153,157 ****
    void ToggleAIn(unsigned char val);
  
!   int HandleConfig(MessageQueue* resp_queue, player_msghdr * hdr, void* data);
    int HandleCommand(player_msghdr * hdr, void * data);
    void HandlePositionCommand(player_position2d_cmd_vel_t position_cmd);
--- 153,157 ----
    void ToggleAIn(unsigned char val);
  
!   int HandleConfig(QueuePointer &resp_queue, player_msghdr * hdr, void* data);
    int HandleCommand(player_msghdr * hdr, void * data);
    void HandlePositionCommand(player_position2d_cmd_vel_t position_cmd);
***************
*** 232,236 ****
  
    // MessageHandler
!   virtual int ProcessMessage(MessageQueue * resp_queue, player_msghdr * hdr, 
void * data);
  };
  
--- 232,236 ----
  
    // MessageHandler
!   virtual int ProcessMessage(QueuePointer &resp_queue, player_msghdr * hdr, 
void * data);
  };
  


-------------------------------------------------------------------------
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

Reply via email to