Update of /cvsroot/playerstage/code/player/server/drivers/mixed/sr3000
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10407/server/drivers/mixed/sr3000
Modified Files:
sr3000.cc
Log Message:
fixed some property initialisation issues
Index: sr3000.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/drivers/mixed/sr3000/sr3000.cc,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** sr3000.cc 1 Nov 2007 22:16:21 -0000 1.5
--- sr3000.cc 15 Feb 2008 09:39:21 -0000 1.6
***************
*** 125,129 ****
// SR3000 specific values
unsigned int rows, cols, bpp, inr;
- unsigned char integration_time;
//ModulationFrq modulation_freq;
size_t buffer_size, buffer_points_size;
--- 125,128 ----
***************
*** 131,138 ****
float *buffer_points, *xp, *yp, *zp;
- // Properties
- IntProperty auto_illumination, integration_time, modulation_freq,
sat_threshold, amp_threshold;
- DoubleProperty static_delay, dynamic_delay;
-
// device bookkeeping
player_devaddr_t pcloud_addr;
--- 130,133 ----
***************
*** 141,144 ****
--- 136,145 ----
player_camera_data_t d_cam_data, i_cam_data;
bool providePCloud, provideDCam, provideICam;
+
+ protected:
+ // Properties
+ IntProperty auto_illumination, integration_time, modulation_freq,
sat_threshold, amp_threshold;
+ DoubleProperty static_delay, dynamic_delay;
+
};
***************
*** 166,171 ****
SR3000::SR3000 (ConfigFile* cf, int section)
: Driver (cf, section),
! auto_illumination (0), integration_time (0), modulation_freq (0),
! sat_threshold (0), amp_threshold (0), static_delay (0), dynamic_delay
(0)
{
memset (&this->pcloud_addr, 0, sizeof (player_devaddr_t));
--- 167,177 ----
SR3000::SR3000 (ConfigFile* cf, int section)
: Driver (cf, section),
! auto_illumination ("auto_illumination", 0, 0),
! integration_time ("integration_time", 0, 0),
! modulation_freq ("modulation_freq", 0, 0),
! sat_threshold ("sat_threshold", 0, 0),
! amp_threshold ("amp_threshold", 0, 0),
! static_delay ("static_delay", 0, 0),
! dynamic_delay ("dynamic_delay", 0, 0)
{
memset (&this->pcloud_addr, 0, sizeof (player_devaddr_t));
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
