Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10464/stage/src
Modified Files:
p_audio.cc p_blobfinder.cc p_bumper.cc p_driver.cc p_driver.h
p_fiducial.cc p_graphics2d.cc p_gripper.cc p_laser.cc
p_localize.cc p_map.cc p_position.cc p_power.cc p_ptz.cc
p_simulation.cc p_sonar.cc p_speech.cc p_wifi.cc
Log Message:
applied Toby's autopointer patches
Index: p_power.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_power.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** p_power.cc 22 Jan 2006 04:16:57 -0000 1.3
--- p_power.cc 23 Aug 2007 19:58:49 -0000 1.4
***************
*** 72,76 ****
// pen.valid, pen.joules, pen.watts, pen.percent, pen.charging );
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_POWER_DATA_STATE,
--- 72,76 ----
// pen.valid, pen.joules, pen.watts, pen.percent, pen.charging );
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_POWER_DATA_STATE,
***************
*** 78,82 ****
}
! int InterfacePower::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 78,82 ----
}
! int InterfacePower::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_wifi.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_wifi.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_wifi.cc 9 Jul 2007 17:18:37 -0000 1.2
--- p_wifi.cc 23 Aug 2007 19:58:49 -0000 1.3
***************
*** 55,59 ****
// Publish it
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_WIFI_DATA_STATE,
--- 55,59 ----
// Publish it
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_WIFI_DATA_STATE,
***************
*** 61,65 ****
}
! int InterfaceWifi::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 61,65 ----
}
! int InterfaceWifi::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_audio.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_audio.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** p_audio.cc 2 Aug 2006 21:14:53 -0000 1.4
--- p_audio.cc 23 Aug 2007 19:58:49 -0000 1.5
***************
*** 78,82 ****
// Publish it
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_OPAQUE_DATA_STATE,
--- 78,82 ----
// Publish it
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_OPAQUE_DATA_STATE,
***************
*** 85,89 ****
}
! int InterfaceAudio::ProcessMessage(MessageQueue * resp_queue,
player_msghdr_t * hdr, void *data)
{
--- 85,89 ----
}
! int InterfaceAudio::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t * hdr, void *data)
{
Index: p_sonar.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_sonar.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** p_sonar.cc 9 Jul 2007 17:18:37 -0000 1.9
--- p_sonar.cc 23 Aug 2007 19:58:49 -0000 1.10
***************
*** 82,86 ****
}
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_RANGES,
--- 82,86 ----
}
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_SONAR_DATA_RANGES,
***************
*** 89,93 ****
! int InterfaceSonar::ProcessMessage( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data )
--- 89,93 ----
! int InterfaceSonar::ProcessMessage( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data )
Index: p_bumper.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_bumper.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_bumper.cc 9 Jul 2007 17:18:37 -0000 1.2
--- p_bumper.cc 23 Aug 2007 19:58:49 -0000 1.3
***************
*** 77,81 ****
}
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_BUMPER_DATA_STATE,
--- 77,81 ----
}
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_BUMPER_DATA_STATE,
***************
*** 84,88 ****
! int InterfaceBumper::ProcessMessage( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data )
--- 84,88 ----
! int InterfaceBumper::ProcessMessage( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data )
Index: p_gripper.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_gripper.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** p_gripper.cc 10 Jul 2006 16:55:38 -0000 1.8
--- p_gripper.cc 23 Aug 2007 19:58:49 -0000 1.9
***************
*** 94,98 ****
// Write data
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
--- 94,98 ----
// Write data
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_GRIPPER_DATA_STATE,
***************
*** 101,105 ****
}
! int InterfaceGripper::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 101,105 ----
}
! int InterfaceGripper::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_driver.h
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_driver.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** p_driver.h 5 Oct 2006 22:27:07 -0000 1.23
--- p_driver.h 23 Aug 2007 19:58:49 -0000 1.24
***************
*** 28,32 ****
virtual int Setup();
virtual int Shutdown();
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data);
--- 28,32 ----
virtual int Setup();
virtual int Shutdown();
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data);
***************
*** 71,75 ****
StgDriver* driver; // the driver instance that created this device
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data) { return(-1); } // empty implementation
--- 71,75 ----
StgDriver* driver; // the driver instance that created this device
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data) { return(-1); } // empty implementation
***************
*** 83,87 ****
InterfaceSimulation( player_devaddr_t addr, StgDriver* driver,ConfigFile*
cf, int section );
virtual ~InterfaceSimulation( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 83,87 ----
InterfaceSimulation( player_devaddr_t addr, StgDriver* driver,ConfigFile*
cf, int section );
virtual ~InterfaceSimulation( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 110,114 ****
virtual ~InterfacePosition( void ){ /* TODO: clean up*/ };
virtual void Publish( void );
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 110,114 ----
virtual ~InterfacePosition( void ){ /* TODO: clean up*/ };
virtual void Publish( void );
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 120,124 ****
InterfaceGripper( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceGripper( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 120,124 ----
InterfaceGripper( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceGripper( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 131,135 ****
InterfaceWifi( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceWifi( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 131,135 ----
InterfaceWifi( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceWifi( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 142,146 ****
InterfaceSpeech( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceSpeech( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 142,146 ----
InterfaceSpeech( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceSpeech( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 153,157 ****
InterfaceAudio( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceAudio( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 153,157 ----
InterfaceAudio( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceAudio( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 166,170 ****
InterfaceLaser( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceLaser( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 166,170 ----
InterfaceLaser( player_devaddr_t addr, StgDriver* driver, ConfigFile* cf,
int section );
virtual ~InterfaceLaser( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 178,182 ****
virtual ~InterfacePower( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 178,182 ----
virtual ~InterfacePower( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 192,196 ****
virtual void Publish( void );
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 192,196 ----
virtual void Publish( void );
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 204,208 ****
virtual ~InterfaceBlobfinder( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 204,208 ----
virtual ~InterfaceBlobfinder( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 216,220 ****
virtual ~InterfacePtz( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 216,220 ----
virtual ~InterfacePtz( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 228,232 ****
virtual ~InterfaceSonar( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 228,232 ----
virtual ~InterfaceSonar( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 241,245 ****
virtual ~InterfaceBumper( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 241,245 ----
virtual ~InterfaceBumper( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 258,262 ****
virtual void Publish( void );
! virtual int ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data);
--- 258,262 ----
virtual void Publish( void );
! virtual int ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data);
***************
*** 269,273 ****
virtual ~InterfaceMap( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 269,273 ----
virtual ~InterfaceMap( void ){ /* TODO: clean up*/ };
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 276,283 ****
// called by ProcessMessage to handle individual messages
! int HandleMsgReqInfo( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
! int HandleMsgReqData( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 276,283 ----
// called by ProcessMessage to handle individual messages
! int HandleMsgReqInfo( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
! int HandleMsgReqData( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
***************
*** 290,294 ****
virtual ~InterfaceGraphics2d( void );
! virtual int ProcessMessage( MessageQueue* resp_queue,
player_msghdr * hdr,
void * data );
--- 290,294 ----
virtual ~InterfaceGraphics2d( void );
! virtual int ProcessMessage( QueuePointer &resp_queue,
player_msghdr * hdr,
void * data );
Index: p_position.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_position.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** p_position.cc 21 Aug 2007 20:28:08 -0000 1.17
--- p_position.cc 23 Aug 2007 19:58:49 -0000 1.18
***************
*** 62,66 ****
}
! int InterfacePosition::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 62,66 ----
}
! int InterfacePosition::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
***************
*** 336,340 ****
// publish this data
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
(void*)&ppd, sizeof(ppd), NULL);
--- 336,340 ----
// publish this data
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA, PLAYER_POSITION2D_DATA_STATE,
(void*)&ppd, sizeof(ppd), NULL);
Index: p_blobfinder.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_blobfinder.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** p_blobfinder.cc 9 Jul 2007 17:18:37 -0000 1.9
--- p_blobfinder.cc 23 Aug 2007 19:58:49 -0000 1.10
***************
*** 115,119 ****
// size_t size = sizeof(bfd) - sizeof(bfd.blobs) + bcount *
sizeof(bfd.blobs[0]);
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS,
--- 115,119 ----
// size_t size = sizeof(bfd) - sizeof(bfd.blobs) + bcount *
sizeof(bfd.blobs[0]);
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_BLOBFINDER_DATA_BLOBS,
***************
*** 121,125 ****
}
! int InterfaceBlobfinder::ProcessMessage( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data )
--- 121,125 ----
}
! int InterfaceBlobfinder::ProcessMessage( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data )
Index: p_laser.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_laser.cc,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** p_laser.cc 9 Jul 2007 17:18:37 -0000 1.19
--- p_laser.cc 23 Aug 2007 19:58:49 -0000 1.20
***************
*** 90,94 ****
// Write laser data
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
--- 90,94 ----
// Write laser data
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_LASER_DATA_SCAN,
***************
*** 97,101 ****
}
! int InterfaceLaser::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 97,101 ----
}
! int InterfaceLaser::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_driver.cc,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** p_driver.cc 20 Sep 2006 01:45:08 -0000 1.39
--- p_driver.cc 23 Aug 2007 19:58:49 -0000 1.40
***************
*** 567,571 ****
// called periodically by player.
int
! StgDriver::ProcessMessage(MessageQueue* resp_queue,
player_msghdr * hdr,
void * data)
--- 567,571 ----
// called periodically by player.
int
! StgDriver::ProcessMessage(QueuePointer &resp_queue,
player_msghdr * hdr,
void * data)
Index: p_simulation.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_simulation.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** p_simulation.cc 2 Dec 2006 00:41:38 -0000 1.21
--- p_simulation.cc 23 Aug 2007 19:58:49 -0000 1.22
***************
*** 162,166 ****
}
! int InterfaceSimulation::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 162,166 ----
}
! int InterfaceSimulation::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_map.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_map.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** p_map.cc 22 Jan 2006 04:16:57 -0000 1.12
--- p_map.cc 23 Aug 2007 19:58:49 -0000 1.13
***************
*** 52,56 ****
// Handle map info request - adapted from Player's mapfile driver by
// Brian Gerkey
! int InterfaceMap::HandleMsgReqInfo( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 52,56 ----
// Handle map info request - adapted from Player's mapfile driver by
// Brian Gerkey
! int InterfaceMap::HandleMsgReqInfo( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
***************
*** 146,150 ****
// Handle map data request
! int InterfaceMap::HandleMsgReqData( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 146,150 ----
// Handle map data request
! int InterfaceMap::HandleMsgReqData( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
***************
*** 239,243 ****
}
! int InterfaceMap::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 239,243 ----
}
! int InterfaceMap::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_speech.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_speech.cc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** p_speech.cc 24 Mar 2006 20:12:42 -0000 1.1
--- p_speech.cc 23 Aug 2007 19:58:49 -0000 1.2
***************
*** 61,65 ****
// Publish it
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_SPEECH_CMD_SAY,
--- 61,65 ----
// Publish it
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_SPEECH_CMD_SAY,
***************
*** 68,72 ****
}
! int InterfaceSpeech::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 68,72 ----
}
! int InterfaceSpeech::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_ptz.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_ptz.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_ptz.cc 29 Jan 2006 04:06:41 -0000 1.2
--- p_ptz.cc 23 Aug 2007 19:58:49 -0000 1.3
***************
*** 70,74 ****
//pdata.zoomspeed = scfg->zoomspeed; // Player doesn't have this field
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_PTZ_DATA_STATE,
--- 70,74 ----
//pdata.zoomspeed = scfg->zoomspeed; // Player doesn't have this field
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_PTZ_DATA_STATE,
***************
*** 76,80 ****
}
! int InterfacePtz::ProcessMessage( MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data )
--- 76,80 ----
}
! int InterfacePtz::ProcessMessage( QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data )
Index: p_localize.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_localize.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** p_localize.cc 22 Jan 2006 04:16:57 -0000 1.2
--- p_localize.cc 23 Aug 2007 19:58:49 -0000 1.3
***************
*** 62,66 ****
// Write localize data
! this->driver->Publish(this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_LOCALIZE_DATA_HYPOTHS,
--- 62,66 ----
// Write localize data
! this->driver->Publish(this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_LOCALIZE_DATA_HYPOTHS,
***************
*** 69,73 ****
! int InterfaceLocalize::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 69,73 ----
! int InterfaceLocalize::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_graphics2d.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_graphics2d.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** p_graphics2d.cc 19 Apr 2006 19:32:35 -0000 1.5
--- p_graphics2d.cc 23 Aug 2007 19:58:49 -0000 1.6
***************
*** 72,76 ****
! int InterfaceGraphics2d::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data)
--- 72,76 ----
! int InterfaceGraphics2d::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* hdr,
void* data)
Index: p_fiducial.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_fiducial.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** p_fiducial.cc 9 Jul 2007 17:18:37 -0000 1.9
--- p_fiducial.cc 23 Aug 2007 19:58:49 -0000 1.10
***************
*** 116,120 ****
// publish this data
! this->driver->Publish( this->addr, NULL,
PLAYER_MSGTYPE_DATA,
PLAYER_FIDUCIAL_DATA_SCAN,
--- 116,120 ----
// publish this data
! this->driver->Publish( this->addr,
PLAYER_MSGTYPE_DATA,
PLAYER_FIDUCIAL_DATA_SCAN,
***************
*** 122,126 ****
}
! int InterfaceFiducial::ProcessMessage(MessageQueue* resp_queue,
player_msghdr_t* hdr,
void* data )
--- 122,126 ----
}
! int InterfaceFiducial::ProcessMessage(QueuePointer &resp_queue,
player_msghdr_t* 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
