Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10946/client_libs/libplayerc++
Modified Files:
actarrayproxy.cc bumperproxy.cc speechproxy.cc
Log Message:
applied Toby's patch to replace fixed-size arrays
Index: speechproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/speechproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** speechproxy.cc 24 Oct 2007 22:32:03 -0000 1.7
--- speechproxy.cc 1 Nov 2007 22:16:16 -0000 1.8
***************
*** 94,98 ****
{
scoped_lock_t lock(mPc->mMutex);
! playerc_speech_say(mDevice, aStr.c_str());
}
--- 94,101 ----
{
scoped_lock_t lock(mPc->mMutex);
! char * str = strdup(aStr.c_str());
! playerc_speech_say(mDevice, str);
! free(str);
!
}
Index: bumperproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/bumperproxy.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** bumperproxy.cc 24 Oct 2007 22:32:02 -0000 1.7
--- bumperproxy.cc 1 Nov 2007 22:16:16 -0000 1.8
***************
*** 97,101 ****
BumperProxy::IsAnyBumped()
{
! for (uint32_t 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)
{
if (IsBumped(i))
Index: actarrayproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/actarrayproxy.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** actarrayproxy.cc 24 Oct 2007 22:32:02 -0000 1.13
--- actarrayproxy.cc 1 Nov 2007 22:16:16 -0000 1.14
***************
*** 184,194 ****
void ActArrayProxy::MoveToMulti(std::vector<float> aPosition)
{
! assert(aPosition.size() < PLAYER_ACTARRAY_NUM_ACTUATORS);
! float values[PLAYER_ACTARRAY_NUM_ACTUATORS];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aPosition.begin(); itr !=
aPosition.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_position_cmd(mDevice, values);
}
--- 184,194 ----
void ActArrayProxy::MoveToMulti(std::vector<float> aPosition)
{
! float * values = new float[aPosition.size()];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aPosition.begin(); itr !=
aPosition.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_position_cmd(mDevice, values, aPosition.size());
! delete [] values;
}
***************
*** 204,214 ****
void ActArrayProxy::MoveAtSpeedMulti(std::vector<float> aSpeed)
{
! assert(aSpeed.size() < PLAYER_ACTARRAY_NUM_ACTUATORS);
! float values[PLAYER_ACTARRAY_NUM_ACTUATORS];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aSpeed.begin(); itr !=
aSpeed.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_speed_cmd(mDevice, values);
}
--- 204,214 ----
void ActArrayProxy::MoveAtSpeedMulti(std::vector<float> aSpeed)
{
! float * values = new float[aSpeed.size()];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aSpeed.begin(); itr !=
aSpeed.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_speed_cmd(mDevice, values, aSpeed.size());
! delete [] values;
}
***************
*** 230,240 ****
void ActArrayProxy::SetActuatorCurrentMulti(std::vector<float> aCurrent)
{
! assert(aCurrent.size() < PLAYER_ACTARRAY_NUM_ACTUATORS);
! float values[PLAYER_ACTARRAY_NUM_ACTUATORS];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aCurrent.begin(); itr !=
aCurrent.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_current_cmd(mDevice, values);
}
--- 230,240 ----
void ActArrayProxy::SetActuatorCurrentMulti(std::vector<float> aCurrent)
{
! float * values = new float[aCurrent.size()];
unsigned int i = 0;
for (std::vector<float>::const_iterator itr = aCurrent.begin(); itr !=
aCurrent.end(); ++itr)
values[i++] = *itr;
scoped_lock_t lock(mPc->mMutex);
! playerc_actarray_multi_current_cmd(mDevice, values, aCurrent.size());
! delete [] values;
}
-------------------------------------------------------------------------
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
