Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11829/client_libs/libplayerc++
Modified Files:
actarrayproxy.cc aioproxy.cc audioproxy.cc blobfinderproxy.cc
bumperproxy.cc cameraproxy.cc clientproxy.cc clientproxy.h
dioproxy.cc fiducialproxy.cc gpsproxy.cc graphics2dproxy.cc
graphics3dproxy.cc gripperproxy.cc healthproxy.cc imuproxy.cc
irproxy.cc laserproxy.cc limbproxy.cc localizeproxy.cc
logproxy.cc mapproxy.cc motorproxy.cc opaqueproxy.cc
plannerproxy.cc playerc++.h playerclient.cc playerclient.h
pointcloud3d.cc position1dproxy.cc position2dproxy.cc
position3dproxy.cc powerproxy.cc ptzproxy.cc rangerproxy.cc
rfidproxy.cc simulationproxy.cc sonarproxy.cc speechproxy.cc
speechrecognitionproxy.cc vectormapproxy.cc wifiproxy.cc
wsnproxy.cc
Log Message:
replaced non portable uint with uint32_t
Index: graphics3dproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/graphics3dproxy.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** graphics3dproxy.cc 10 Jul 2007 09:01:50 -0000 1.2
--- graphics3dproxy.cc 24 Oct 2007 22:32:02 -0000 1.3
***************
*** 46,50 ****
using namespace PlayerCc;
! Graphics3dProxy::Graphics3dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! Graphics3dProxy::Graphics3dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! Graphics3dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Graphics3dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: position1dproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/position1dproxy.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** position1dproxy.cc 10 Jul 2007 09:01:50 -0000 1.4
--- position1dproxy.cc 24 Oct 2007 22:32:03 -0000 1.5
***************
*** 46,50 ****
using namespace PlayerCc;
! Position1dProxy::Position1dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! Position1dProxy::Position1dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! Position1dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Position1dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: playerclient.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerclient.cc,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** playerclient.cc 10 Jul 2007 09:01:50 -0000 1.26
--- playerclient.cc 24 Oct 2007 22:32:03 -0000 1.27
***************
*** 59,63 ****
using namespace PlayerCc;
! PlayerClient::PlayerClient(const std::string aHostname, uint aPort,
int aTransport) :
mClient(NULL),
--- 59,63 ----
using namespace PlayerCc;
! PlayerClient::PlayerClient(const std::string aHostname, uint32_t aPort,
int aTransport) :
mClient(NULL),
***************
*** 85,89 ****
}
! void PlayerClient::Connect(const std::string aHostname, uint aPort)
{
assert("" != aHostname);
--- 85,89 ----
}
! void PlayerClient::Connect(const std::string aHostname, uint32_t aPort)
{
assert("" != aHostname);
***************
*** 175,179 ****
// blocking
! void PlayerClient::Run(uint aTimeout)
{
timespec sleep = {0,aTimeout*1000000};
--- 175,179 ----
// blocking
! void PlayerClient::Run(uint32_t aTimeout)
{
timespec sleep = {0,aTimeout*1000000};
***************
*** 199,203 ****
}
! bool PlayerClient::Peek(uint aTimeout)
{
ClientProxy::scoped_lock_t lock(mMutex);
--- 199,203 ----
}
! bool PlayerClient::Peek(uint32_t aTimeout)
{
ClientProxy::scoped_lock_t lock(mMutex);
***************
*** 254,258 ****
// change data delivery mode
// valid modes are given in include/messages.h
! void PlayerClient::SetDataMode(uint aMode)
{
assert((aMode==PLAYER_DATAMODE_PULL)||(aMode==PLAYER_DATAMODE_PUSH));
--- 254,258 ----
// change data delivery mode
// valid modes are given in include/messages.h
! void PlayerClient::SetDataMode(uint32_t aMode)
{
assert((aMode==PLAYER_DATAMODE_PULL)||(aMode==PLAYER_DATAMODE_PUSH));
Index: playerc++.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -C2 -d -r1.100 -r1.101
*** playerc++.h 18 Oct 2007 22:23:52 -0000 1.100
--- playerc++.h 24 Oct 2007 22:32:02 -0000 1.101
***************
*** 87,91 ****
//
// // Subscribe
! // void Subscribe(uint aIndex);
// // Unsubscribe
// void Unsubscribe();
--- 87,91 ----
//
// // Subscribe
! // void Subscribe(uint32_t aIndex);
// // Unsubscribe
[...1911 lines suppressed...]
/// destructor
~WSNProxy();
! uint GetNodeType () const { return GetVar(mDevice->node_type); };
! uint GetNodeID () const { return GetVar(mDevice->node_id); };
! uint GetNodeParentID() const { return GetVar(mDevice->node_parent_id); };
player_wsn_node_data_t
--- 2459,2469 ----
public:
/// constructor
! WSNProxy(PlayerClient *aPc, uint32_t aIndex=0);
/// destructor
~WSNProxy();
! uint32_t GetNodeType () const { return GetVar(mDevice->node_type);
};
! uint32_t GetNodeID () const { return GetVar(mDevice->node_id);
};
! uint32_t GetNodeParentID() const { return
GetVar(mDevice->node_parent_id); };
player_wsn_node_data_t
Index: blobfinderproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/blobfinderproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** blobfinderproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- blobfinderproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 48,52 ****
using namespace PlayerCc;
! BlobfinderProxy::BlobfinderProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 48,52 ----
using namespace PlayerCc;
! BlobfinderProxy::BlobfinderProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 64,68 ****
void
! BlobfinderProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 64,68 ----
void
! BlobfinderProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: position3dproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/position3dproxy.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** position3dproxy.cc 6 Aug 2007 06:30:49 -0000 1.9
--- position3dproxy.cc 24 Oct 2007 22:32:03 -0000 1.10
***************
*** 46,50 ****
using namespace PlayerCc;
! Position3dProxy::Position3dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! Position3dProxy::Position3dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! Position3dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Position3dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: simulationproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/simulationproxy.cc,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** simulationproxy.cc 31 Jul 2007 06:18:13 -0000 1.10
--- simulationproxy.cc 24 Oct 2007 22:32:03 -0000 1.11
***************
*** 46,50 ****
using namespace PlayerCc;
! SimulationProxy::SimulationProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! SimulationProxy::SimulationProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! SimulationProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! SimulationProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: limbproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/limbproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** limbproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- limbproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 56,60 ****
using namespace PlayerCc;
! LimbProxy::LimbProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 56,60 ----
using namespace PlayerCc;
! LimbProxy::LimbProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 69,73 ****
}
! void LimbProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 69,73 ----
}
! void LimbProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: audioproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/audioproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** audioproxy.cc 10 Jul 2007 09:01:50 -0000 1.7
--- audioproxy.cc 24 Oct 2007 22:32:02 -0000 1.8
***************
*** 56,60 ****
using namespace PlayerCc;
! AudioProxy::AudioProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 56,60 ----
using namespace PlayerCc;
! AudioProxy::AudioProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 69,73 ****
}
! void AudioProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 69,73 ----
}
! void AudioProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: cameraproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/cameraproxy.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** cameraproxy.cc 10 Jul 2007 09:01:50 -0000 1.12
--- cameraproxy.cc 24 Oct 2007 22:32:02 -0000 1.13
***************
*** 55,59 ****
using namespace PlayerCc;
! CameraProxy::CameraProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL),
--- 55,59 ----
using namespace PlayerCc;
! CameraProxy::CameraProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL),
***************
*** 73,77 ****
void
! CameraProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 73,77 ----
void
! CameraProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 95,99 ****
void
! CameraProxy::SaveFrame(const std::string aPrefix, uint aWidth)
{
std::ostringstream filename;
--- 95,99 ----
void
! CameraProxy::SaveFrame(const std::string aPrefix, uint32_t aWidth)
{
std::ostringstream filename;
Index: logproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/logproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** logproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- logproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! LogProxy::LogProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! LogProxy::LogProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! LogProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! LogProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: dioproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/dioproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** dioproxy.cc 10 Jul 2007 09:01:50 -0000 1.7
--- dioproxy.cc 24 Oct 2007 22:32:02 -0000 1.8
***************
*** 46,50 ****
using namespace PlayerCc;
! DioProxy::DioProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! DioProxy::DioProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! DioProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! DioProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 87,91 ****
{
os << "#DIO (" << c.GetInterface() << ":" << c.GetIndex() << ")" <<
std::endl;
! uint count = c.GetCount();
if (count < 0)
--- 87,91 ----
{
os << "#DIO (" << c.GetInterface() << ":" << c.GetIndex() << ")" <<
std::endl;
! uint32_t count = c.GetCount();
if (count < 0)
***************
*** 107,111 ****
bool
! DioProxy::GetInput(uint aIndex) const
{
assert(aIndex < GetCount());
--- 107,111 ----
bool
! DioProxy::GetInput(uint32_t aIndex) const
{
assert(aIndex < GetCount());
***************
*** 115,119 ****
void
! DioProxy::SetOutput(uint aCount, uint32_t aDigout)
{
scoped_lock_t lock(mPc->mMutex);
--- 115,119 ----
void
! DioProxy::SetOutput(uint32_t aCount, uint32_t aDigout)
{
scoped_lock_t lock(mPc->mMutex);
Index: speechrecognitionproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/speechrecognitionproxy.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** speechrecognitionproxy.cc 10 Jul 2007 09:01:51 -0000 1.5
--- speechrecognitionproxy.cc 24 Oct 2007 22:32:03 -0000 1.6
***************
*** 46,50 ****
using namespace PlayerCc;
! SpeechRecognitionProxy::SpeechRecognitionProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! SpeechRecognitionProxy::SpeechRecognitionProxy(PlayerClient *aPc, uint32_t
aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! SpeechRecognitionProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! SpeechRecognitionProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 88,92 ****
os << "#SpeechRecognition (" << c.GetInterface() << ":" << c.GetIndex() <<
")" << std::endl;
os << " words [" << c.GetCount() << "]: ";
! for (uint i=0; i < c.GetCount(); i++)
{
std::cout << c.GetWord(i) << " " ;
--- 88,92 ----
os << "#SpeechRecognition (" << c.GetInterface() << ":" << c.GetIndex() <<
")" << std::endl;
os << " words [" << c.GetCount() << "]: ";
! for (uint32_t i=0; i < c.GetCount(); i++)
{
std::cout << c.GetWord(i) << " " ;
Index: powerproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/powerproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** powerproxy.cc 10 Jul 2007 09:01:51 -0000 1.6
--- powerproxy.cc 24 Oct 2007 22:32:03 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! PowerProxy::PowerProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! PowerProxy::PowerProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! PowerProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! PowerProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: wsnproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/wsnproxy.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** wsnproxy.cc 10 Jul 2007 09:01:51 -0000 1.2
--- wsnproxy.cc 24 Oct 2007 22:32:03 -0000 1.3
***************
*** 51,55 ****
using namespace PlayerCc;
! WSNProxy::WSNProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 51,55 ----
using namespace PlayerCc;
! WSNProxy::WSNProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 67,71 ****
void
! WSNProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 67,71 ----
void
! WSNProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: opaqueproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/opaqueproxy.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** opaqueproxy.cc 20 Sep 2007 23:15:47 -0000 1.4
--- opaqueproxy.cc 24 Oct 2007 22:32:02 -0000 1.5
***************
*** 55,59 ****
using namespace PlayerCc;
! OpaqueProxy::OpaqueProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 55,59 ----
using namespace PlayerCc;
! OpaqueProxy::OpaqueProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 71,75 ****
void
! OpaqueProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 71,75 ----
void
! OpaqueProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: healthproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/healthproxy.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** healthproxy.cc 10 Jul 2007 09:01:50 -0000 1.2
--- healthproxy.cc 24 Oct 2007 22:32:02 -0000 1.3
***************
*** 51,55 ****
using namespace PlayerCc;
! HealthProxy::HealthProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 51,55 ----
using namespace PlayerCc;
! HealthProxy::HealthProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 67,71 ****
void
! HealthProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 67,71 ----
void
! HealthProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: gripperproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/gripperproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** gripperproxy.cc 10 Jul 2007 09:01:50 -0000 1.7
--- gripperproxy.cc 24 Oct 2007 22:32:02 -0000 1.8
***************
*** 46,50 ****
using namespace PlayerCc;
! GripperProxy::GripperProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! GripperProxy::GripperProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! GripperProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! GripperProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: rfidproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/rfidproxy.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** rfidproxy.cc 10 Jul 2007 09:01:51 -0000 1.2
--- rfidproxy.cc 24 Oct 2007 22:32:03 -0000 1.3
***************
*** 51,55 ****
using namespace PlayerCc;
! RFIDProxy::RFIDProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 51,55 ----
using namespace PlayerCc;
! RFIDProxy::RFIDProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 67,71 ****
void
! RFIDProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 67,71 ----
void
! RFIDProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 92,96 ****
os << "#RFID(" << c.GetInterface() << ":" << c.GetIndex() << ")" <<
std::endl;
os << "Tags count:" << c.GetTagsCount() << std::endl;
! for (uint i=0;i < c.GetTagsCount();i++)
{
playerc_rfidtag_t tag;
--- 92,96 ----
os << "#RFID(" << c.GetInterface() << ":" << c.GetIndex() << ")" <<
std::endl;
os << "Tags count:" << c.GetTagsCount() << std::endl;
! for (uint32_t i=0;i < c.GetTagsCount();i++)
{
playerc_rfidtag_t tag;
Index: gpsproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/gpsproxy.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** gpsproxy.cc 10 Jul 2007 09:01:50 -0000 1.5
--- gpsproxy.cc 24 Oct 2007 22:32:02 -0000 1.6
***************
*** 47,51 ****
using namespace PlayerCc;
! GpsProxy::GpsProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 47,51 ----
using namespace PlayerCc;
! GpsProxy::GpsProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 63,67 ****
void
! GpsProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 63,67 ----
void
! GpsProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: clientproxy.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/clientproxy.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** clientproxy.h 10 Jul 2007 09:01:50 -0000 1.6
--- clientproxy.h 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 95,99 ****
//
// @throw PlayerError Throws a PlayerError if unable to connect to the
client
! ClientProxy(PlayerClient* aPc, uint aIndex);
// destructor will try to close access to the device
--- 95,99 ----
//
// @throw PlayerError Throws a PlayerError if unable to connect to the
client
! ClientProxy(PlayerClient* aPc, uint32_t aIndex);
// destructor will try to close access to the device
***************
*** 106,110 ****
// I wish these could be pure virtual,
// but they're used in the constructor/destructor
! virtual void Subscribe(uint aIndex) {};
// Unsubscribe from the proxy
--- 106,110 ----
// I wish these could be pure virtual,
// but they're used in the constructor/destructor
! virtual void Subscribe(uint32_t aIndex) {};
// Unsubscribe from the proxy
***************
*** 201,208 ****
PlayerClient * GetPlayerClient() const { return mPc;}
/// Returns device index
! uint GetIndex() const { return GetVar(mInfo->addr.index); };
/// Returns device interface
! uint GetInterface() const { return GetVar(mInfo->addr.interf); };
/// Returns device interface
--- 201,208 ----
PlayerClient * GetPlayerClient() const { return mPc;}
/// Returns device index
! uint32_t GetIndex() const { return GetVar(mInfo->addr.index); };
/// Returns device interface
! uint32_t GetInterface() const { return GetVar(mInfo->addr.interf); };
/// Returns device interface
***************
*** 231,235 ****
/// Send a message asking if the device supports the given message
/// type and subtype. If it does, the return value will be 1, and 0
otherwise.
! int HasCapability(uint aType, uint aSubtype);
/// @brief Request an integer property
--- 231,235 ----
/// Send a message asking if the device supports the given message
/// type and subtype. If it does, the return value will be 1, and 0
otherwise.
! int HasCapability(uint32_t aType, uint32_t aSubtype);
/// @brief Request an integer property
Index: position2dproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/position2dproxy.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** position2dproxy.cc 10 Jul 2007 09:01:50 -0000 1.13
--- position2dproxy.cc 24 Oct 2007 22:32:03 -0000 1.14
***************
*** 46,50 ****
using namespace PlayerCc;
! Position2dProxy::Position2dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! Position2dProxy::Position2dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! Position2dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Position2dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: speechproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/speechproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** speechproxy.cc 10 Jul 2007 09:01:51 -0000 1.6
--- speechproxy.cc 24 Oct 2007 22:32:03 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! SpeechProxy::SpeechProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! SpeechProxy::SpeechProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! SpeechProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! SpeechProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: imuproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/imuproxy.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** imuproxy.cc 6 Aug 2007 06:30:49 -0000 1.4
--- imuproxy.cc 24 Oct 2007 22:32:02 -0000 1.5
***************
*** 46,50 ****
using namespace PlayerCc;
! ImuProxy::ImuProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! ImuProxy::ImuProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! ImuProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! ImuProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: laserproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/laserproxy.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** laserproxy.cc 6 Aug 2007 06:30:49 -0000 1.13
--- laserproxy.cc 24 Oct 2007 22:32:02 -0000 1.14
***************
*** 51,55 ****
! LaserProxy::LaserProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 51,55 ----
! LaserProxy::LaserProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 67,71 ****
void
! LaserProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 67,71 ----
void
! LaserProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 91,96 ****
LaserProxy::Configure(double min_angle,
double max_angle,
! uint scan_res,
! uint range_res,
bool intensity,
double aScanningFrequency)
--- 91,96 ----
LaserProxy::Configure(double min_angle,
double max_angle,
! uint32_t scan_res,
! uint32_t range_res,
bool intensity,
double aScanningFrequency)
Index: ptzproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/ptzproxy.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ptzproxy.cc 6 Aug 2007 06:30:49 -0000 1.8
--- ptzproxy.cc 24 Oct 2007 22:32:03 -0000 1.9
***************
*** 46,50 ****
using namespace PlayerCc;
! PtzProxy::PtzProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! PtzProxy::PtzProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! PtzProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! PtzProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 100,104 ****
}
! void PtzProxy::SelectControlMode(uint aMode)
{
boost::mutex::scoped_lock lock(mPc->mMutex);
--- 100,104 ----
}
! void PtzProxy::SelectControlMode(uint32_t aMode)
{
boost::mutex::scoped_lock lock(mPc->mMutex);
Index: wifiproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/wifiproxy.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** wifiproxy.cc 18 Oct 2007 22:23:52 -0000 1.8
--- wifiproxy.cc 24 Oct 2007 22:32:03 -0000 1.9
***************
*** 51,55 ****
using namespace PlayerCc;
! WiFiProxy::WiFiProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 51,55 ----
using namespace PlayerCc;
! WiFiProxy::WiFiProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 68,72 ****
void
! WiFiProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 68,72 ----
void
! WiFiProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: bumperproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/bumperproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** bumperproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- bumperproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! BumperProxy::BumperProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! BumperProxy::BumperProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! BumperProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! BumperProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 97,101 ****
BumperProxy::IsAnyBumped()
{
! for (uint i=0; (i < GetCount())&&(i < PLAYER_BUMPER_MAX_SAMPLES); ++i)
{
if (IsBumped(i))
--- 97,101 ----
BumperProxy::IsAnyBumped()
{
! for (uint32_t i=0; (i < GetCount())&&(i < PLAYER_BUMPER_MAX_SAMPLES); ++i)
{
if (IsBumped(i))
Index: graphics2dproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/graphics2dproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** graphics2dproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- graphics2dproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! Graphics2dProxy::Graphics2dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! Graphics2dProxy::Graphics2dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! Graphics2dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Graphics2dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: mapproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/mapproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** mapproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- mapproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! MapProxy::MapProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! MapProxy::MapProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! MapProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! MapProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: clientproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/clientproxy.cc,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** clientproxy.cc 10 Jul 2007 09:01:50 -0000 1.17
--- clientproxy.cc 24 Oct 2007 22:32:02 -0000 1.18
***************
*** 49,53 ****
using namespace PlayerCc;
! ClientProxy::ClientProxy(PlayerClient* aPc, uint aIndex) :
mPc(aPc),
mClient(aPc->mClient),
--- 49,53 ----
using namespace PlayerCc;
! ClientProxy::ClientProxy(PlayerClient* aPc, uint32_t aIndex) :
mPc(aPc),
mClient(aPc->mClient),
***************
*** 105,109 ****
}
! int ClientProxy::HasCapability(uint aType, uint aSubtype)
{
scoped_lock_t lock(mPc->mMutex);
--- 105,109 ----
}
! int ClientProxy::HasCapability(uint32_t aType, uint32_t aSubtype)
{
scoped_lock_t lock(mPc->mMutex);
Index: vectormapproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/vectormapproxy.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** vectormapproxy.cc 17 Sep 2007 02:18:52 -0000 1.2
--- vectormapproxy.cc 24 Oct 2007 22:32:03 -0000 1.3
***************
*** 50,54 ****
// Constructor
! VectorMapProxy::VectorMapProxy(PlayerClient *aPc, uint aIndex) :
ClientProxy(aPc, aIndex),
mDevice(NULL)
{
--- 50,54 ----
// Constructor
! VectorMapProxy::VectorMapProxy(PlayerClient *aPc, uint32_t aIndex) :
ClientProxy(aPc, aIndex),
mDevice(NULL)
{
***************
*** 65,69 ****
// Subscribe
! void VectorMapProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 65,69 ----
// Subscribe
! void VectorMapProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: pointcloud3d.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/pointcloud3d.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pointcloud3d.cc 10 Jul 2007 09:01:50 -0000 1.2
--- pointcloud3d.cc 24 Oct 2007 22:32:03 -0000 1.3
***************
*** 46,50 ****
using namespace PlayerCc;
! Pointcloud3dProxy::Pointcloud3dProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex), mDevice(NULL)
{
--- 46,50 ----
using namespace PlayerCc;
! Pointcloud3dProxy::Pointcloud3dProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex), mDevice(NULL)
{
***************
*** 62,66 ****
void
! Pointcloud3dProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! Pointcloud3dProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: aioproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/aioproxy.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** aioproxy.cc 10 Jul 2007 09:01:50 -0000 1.8
--- aioproxy.cc 24 Oct 2007 22:32:02 -0000 1.9
***************
*** 47,51 ****
using namespace PlayerCc;
! AioProxy::AioProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 47,51 ----
using namespace PlayerCc;
! AioProxy::AioProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 63,67 ****
void
! AioProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 63,67 ----
void
! AioProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 85,89 ****
void
! AioProxy::SetVoltage(uint aIndex, double aVoltage)
{
scoped_lock_t lock(mPc->mMutex);
--- 85,89 ----
void
! AioProxy::SetVoltage(uint32_t aIndex, double aVoltage)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 102,106 ****
else
{
! for (uint i=0; i < c.GetCount(); ++i)
{
os << "AIO" << i << " - " << c[i] << std::endl;
--- 102,106 ----
else
{
! for (uint32_t i=0; i < c.GetCount(); ++i)
{
os << "AIO" << i << " - " << c[i] << std::endl;
Index: playerclient.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerclient.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** playerclient.h 10 Jul 2007 09:01:50 -0000 1.24
--- playerclient.h 24 Oct 2007 22:32:03 -0000 1.25
***************
*** 119,123 ****
// Connect to the indicated host and port.
// @exception throws PlayerError if unsuccessfull
! void Connect(const std::string aHostname, uint aPort);
// Disconnect from server.
--- 119,123 ----
// Connect to the indicated host and port.
// @exception throws PlayerError if unsuccessfull
! void Connect(const std::string aHostname, uint32_t aPort);
// Disconnect from server.
***************
*** 131,135 ****
// The port number of the server, stored for convenience
! uint mPort;
// Which transport (TCP or UDP) we're using
--- 131,135 ----
// The port number of the server, stored for convenience
! uint32_t mPort;
// Which transport (TCP or UDP) we're using
***************
*** 149,153 ****
/// Make a client and connect it as indicated.
PlayerClient(const std::string aHostname=PLAYER_HOSTNAME,
! uint aPort=PLAYER_PORTNUM,
int transport=PLAYERC_TRANSPORT_TCP);
--- 149,153 ----
/// Make a client and connect it as indicated.
PlayerClient(const std::string aHostname=PLAYER_HOSTNAME,
! uint32_t aPort=PLAYER_PORTNUM,
int transport=PLAYERC_TRANSPORT_TCP);
***************
*** 169,173 ****
/// This starts a blocking loop on @ref Read()
! void Run(uint aTimeout=10); // aTimeout in ms
/// Stops the @ref Run() loop
--- 169,173 ----
/// This starts a blocking loop on @ref Read()
! void Run(uint32_t aTimeout=10); // aTimeout in ms
/// Stops the @ref Run() loop
***************
*** 180,184 ****
/// - false if there is no data waiting
/// - true if there is data waiting
! bool Peek(uint timeout=0);
/// @brief Set connection retry limit, which is the number of times
--- 180,184 ----
/// - false if there is no data waiting
/// - true if there is data waiting
! bool Peek(uint32_t timeout=0);
/// @brief Set connection retry limit, which is the number of times
***************
*** 220,224 ****
// ///
// /// @exception throws PlayerError if unsuccessfull
! // void SetFrequency(uint aFreq);
/// @brief Set whether the client operates in Push/Pull modes
--- 220,224 ----
// ///
// /// @exception throws PlayerError if unsuccessfull
! // void SetFrequency(uint32_t aFreq);
/// @brief Set whether the client operates in Push/Pull modes
***************
*** 234,238 ****
///
/// @exception throws PlayerError if unsuccessfull
! void SetDataMode(uint aMode);
/// @brief Set a replace rule for the clients queue on the server.
--- 234,238 ----
///
/// @exception throws PlayerError if unsuccessfull
! void SetDataMode(uint32_t aMode);
/// @brief Set a replace rule for the clients queue on the server.
***************
*** 267,271 ****
/// Returns the port
! uint GetPort() const { return(mPort); };
/// Get the interface code for a given name
--- 267,271 ----
/// Returns the port
! uint32_t GetPort() const { return(mPort); };
/// Get the interface code for a given name
Index: rangerproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/rangerproxy.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** rangerproxy.cc 10 Jul 2007 09:01:51 -0000 1.3
--- rangerproxy.cc 24 Oct 2007 22:32:03 -0000 1.4
***************
*** 46,50 ****
using namespace PlayerCc;
! RangerProxy::RangerProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! RangerProxy::RangerProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 59,63 ****
}
! void RangerProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 59,63 ----
}
! void RangerProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 79,83 ****
}
! player_pose3d_t RangerProxy::GetSensorPose(uint aIndex) const
{
if (aIndex > mDevice->sensor_count)
--- 79,83 ----
}
! player_pose3d_t RangerProxy::GetSensorPose(uint32_t aIndex) const
{
if (aIndex > mDevice->sensor_count)
***************
*** 86,90 ****
}
! player_bbox3d_t RangerProxy::GetSensorSize(uint aIndex) const
{
if (aIndex > mDevice->sensor_count)
--- 86,90 ----
}
! player_bbox3d_t RangerProxy::GetSensorSize(uint32_t aIndex) const
{
if (aIndex > mDevice->sensor_count)
***************
*** 93,97 ****
}
! double RangerProxy::GetRange(uint aIndex) const
{
if (aIndex > mDevice->ranges_count)
--- 93,97 ----
}
! double RangerProxy::GetRange(uint32_t aIndex) const
{
if (aIndex > mDevice->ranges_count)
***************
*** 100,104 ****
}
! double RangerProxy::GetIntensity(uint aIndex) const
{
if (aIndex > mDevice->intensities_count)
--- 100,104 ----
}
! double RangerProxy::GetIntensity(uint32_t aIndex) const
{
if (aIndex > mDevice->intensities_count)
***************
*** 159,163 ****
{
os << c.GetSensorCount() << " sensors:" << endl;
! for (uint ii = 0; ii < c.GetSensorCount(); ii++)
{
pose = c.GetSensorPose(ii);
--- 159,163 ----
{
os << c.GetSensorCount() << " sensors:" << endl;
! for (uint32_t ii = 0; ii < c.GetSensorCount(); ii++)
{
pose = c.GetSensorPose(ii);
***************
*** 171,175 ****
{
os << c.GetRangeCount() << " range readings:" << endl << " [";
! uint ii;
for (ii = 0; ii < c.GetRangeCount() - 1; ii++)
os << c.GetRange(ii) << ", ";
--- 171,175 ----
{
os << c.GetRangeCount() << " range readings:" << endl << " [";
! uint32_t ii;
for (ii = 0; ii < c.GetRangeCount() - 1; ii++)
os << c.GetRange(ii) << ", ";
***************
*** 179,183 ****
{
os << c.GetIntensityCount() << " intensity readings:" << endl << " [";
! uint ii;
for (ii = 0; ii < c.GetIntensityCount() - 1; ii++)
os << c.GetIntensity(ii) << ", ";
--- 179,183 ----
{
os << c.GetIntensityCount() << " intensity readings:" << endl << " [";
! uint32_t ii;
for (ii = 0; ii < c.GetIntensityCount() - 1; ii++)
os << c.GetIntensity(ii) << ", ";
Index: actarrayproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/actarrayproxy.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** actarrayproxy.cc 6 Aug 2007 06:30:49 -0000 1.12
--- actarrayproxy.cc 24 Oct 2007 22:32:02 -0000 1.13
***************
*** 57,61 ****
using namespace PlayerCc;
! ActArrayProxy::ActArrayProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 57,61 ----
using namespace PlayerCc;
! ActArrayProxy::ActArrayProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 70,74 ****
}
! void ActArrayProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 70,74 ----
}
! void ActArrayProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 103,107 ****
os << "Act \tType\tLength\tOrientation\t\tAxis\t\t\tMin\tCentre\tMax\tHome"
"\tCfgSpd\tPos\tSpeed\tState\tBrakes" << std::endl;
! for (uint ii = 0; ii < a.GetCount (); ii++)
{
data = a.GetActuatorData(ii);
--- 103,107 ----
os << "Act \tType\tLength\tOrientation\t\tAxis\t\t\tMin\tCentre\tMax\tHome"
"\tCfgSpd\tPos\tSpeed\tState\tBrakes" << std::endl;
! for (uint32_t ii = 0; ii < a.GetCount (); ii++)
{
data = a.GetActuatorData(ii);
***************
*** 161,165 ****
// Speed config
! void ActArrayProxy::SetSpeedConfig (uint aJoint, float aSpeed)
{
scoped_lock_t lock(mPc->mMutex);
--- 161,165 ----
// Speed config
! void ActArrayProxy::SetSpeedConfig (uint32_t aJoint, float aSpeed)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 175,179 ****
// Send an actuator to a position
! void ActArrayProxy::MoveTo(uint aJoint, float aPosition)
{
scoped_lock_t lock(mPc->mMutex);
--- 175,179 ----
// Send an actuator to a position
! void ActArrayProxy::MoveTo(uint32_t aJoint, float aPosition)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 195,199 ****
// Move an actuator at a speed
! void ActArrayProxy::MoveAtSpeed(uint aJoint, float aSpeed)
{
scoped_lock_t lock(mPc->mMutex);
--- 195,199 ----
// Move an actuator at a speed
! void ActArrayProxy::MoveAtSpeed(uint32_t aJoint, float aSpeed)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 221,225 ****
// Move an actuator at a speed
! void ActArrayProxy::SetActuatorCurrent(uint aJoint, float aCurrent)
{
scoped_lock_t lock(mPc->mMutex);
--- 221,225 ----
// Move an actuator at a speed
! void ActArrayProxy::SetActuatorCurrent(uint32_t aJoint, float aCurrent)
{
scoped_lock_t lock(mPc->mMutex);
***************
*** 239,243 ****
}
! player_actarray_actuator_t ActArrayProxy::GetActuatorData(uint aJoint) const
{
if (aJoint > mDevice->actuators_count)
--- 239,243 ----
}
! player_actarray_actuator_t ActArrayProxy::GetActuatorData(uint32_t aJoint)
const
{
if (aJoint > mDevice->actuators_count)
***************
*** 253,257 ****
// Same again for getting actuator geometry
! player_actarray_actuatorgeom_t ActArrayProxy::GetActuatorGeom(uint aJoint)
const
{
if (aJoint > mDevice->actuators_count)
--- 253,257 ----
// Same again for getting actuator geometry
! player_actarray_actuatorgeom_t ActArrayProxy::GetActuatorGeom(uint32_t
aJoint) const
{
if (aJoint > mDevice->actuators_count)
Index: irproxy.cc
===================================================================
RCS file: /cvsroot/playerstage/code/player/client_libs/libplayerc++/irproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** irproxy.cc 10 Jul 2007 09:01:50 -0000 1.7
--- irproxy.cc 24 Oct 2007 22:32:02 -0000 1.8
***************
*** 46,50 ****
using namespace PlayerCc;
! IrProxy::IrProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! IrProxy::IrProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! IrProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! IrProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: localizeproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/localizeproxy.cc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** localizeproxy.cc 10 Jul 2007 09:01:50 -0000 1.9
--- localizeproxy.cc 24 Oct 2007 22:32:02 -0000 1.10
***************
*** 46,50 ****
using namespace PlayerCc;
! LocalizeProxy::LocalizeProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! LocalizeProxy::LocalizeProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! LocalizeProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! LocalizeProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: plannerproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/plannerproxy.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** plannerproxy.cc 10 Jul 2007 09:01:50 -0000 1.8
--- plannerproxy.cc 24 Oct 2007 22:32:02 -0000 1.9
***************
*** 46,50 ****
using namespace PlayerCc;
! PlannerProxy::PlannerProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! PlannerProxy::PlannerProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! PlannerProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! PlannerProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: sonarproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/sonarproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** sonarproxy.cc 10 Jul 2007 09:01:51 -0000 1.6
--- sonarproxy.cc 24 Oct 2007 22:32:03 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! SonarProxy::SonarProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! SonarProxy::SonarProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! SonarProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! SonarProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: fiducialproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/fiducialproxy.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** fiducialproxy.cc 10 Jul 2007 09:01:50 -0000 1.6
--- fiducialproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
***************
*** 46,50 ****
using namespace PlayerCc;
! FiducialProxy::FiducialProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! FiducialProxy::FiducialProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! FiducialProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! FiducialProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
Index: motorproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/motorproxy.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** motorproxy.cc 10 Jul 2007 09:01:50 -0000 1.4
--- motorproxy.cc 24 Oct 2007 22:32:02 -0000 1.5
***************
*** 46,50 ****
using namespace PlayerCc;
! MotorProxy::MotorProxy(PlayerClient *aPc, uint aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
--- 46,50 ----
using namespace PlayerCc;
! MotorProxy::MotorProxy(PlayerClient *aPc, uint32_t aIndex)
: ClientProxy(aPc, aIndex),
mDevice(NULL)
***************
*** 62,66 ****
void
! MotorProxy::Subscribe(uint aIndex)
{
scoped_lock_t lock(mPc->mMutex);
--- 62,66 ----
void
! MotorProxy::Subscribe(uint32_t aIndex)
{
scoped_lock_t lock(mPc->mMutex);
-------------------------------------------------------------------------
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
