Update of /cvsroot/playerstage/code/player/client_libs/libplayerc++
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15391
Modified Files:
laserproxy.cc playerc++.h
Log Message:
separated id request from configure request
Index: laserproxy.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/laserproxy.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** laserproxy.cc 24 Oct 2007 22:32:02 -0000 1.14
--- laserproxy.cc 1 Nov 2007 23:55:17 -0000 1.15
***************
*** 111,114 ****
--- 111,122 ----
throw PlayerError("LaserProxy::RequestConfigure()", "error getting
config");
intensity = temp_int == 0 ? false : true;
+
+ return;
+ }
+
+ void
+ LaserProxy::RequestID()
+ {
+ scoped_lock_t lock(mPc->mMutex);
if (0 != playerc_laser_get_id(mDevice))
throw PlayerError("LaserProxy::RequestConfigure()", "error getting id");
Index: playerc++.h
===================================================================
RCS file:
/cvsroot/playerstage/code/player/client_libs/libplayerc++/playerc++.h,v
retrieving revision 1.102
retrieving revision 1.103
diff -C2 -d -r1.102 -r1.103
*** playerc++.h 31 Oct 2007 01:18:42 -0000 1.102
--- playerc++.h 1 Nov 2007 23:55:17 -0000 1.103
***************
*** 1080,1084 ****
{ return GetVar(mDevice->intensity[aIndex]); };
! /// get the laser ID, call RequestConfigure first
int GetID() const
{ return GetVar(mDevice->laser_id); };
--- 1080,1084 ----
{ return GetVar(mDevice->intensity[aIndex]); };
! /// get the laser ID, call RequestId first
int GetID() const
{ return GetVar(mDevice->laser_id); };
***************
*** 1100,1106 ****
double aScanningFrequency);
! /// Get the current laser configuration; it is read into the
/// relevant class attributes.
void RequestConfigure();
/// Get the laser's geometry; it is read into the
--- 1100,1109 ----
double aScanningFrequency);
! /// Request the current laser configuration; it is read into the
/// relevant class attributes.
void RequestConfigure();
+
+ /// Request the ID of the laser; read it with GetID()
+ void RequestID();
/// Get the laser's geometry; it is read into the
-------------------------------------------------------------------------
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
