Update of /cvsroot/playerstage/code/player/server/libplayerdrivers
In directory
sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4552/server/libplayerdrivers
Modified Files:
Tag: release-2-0-patches
driverregistry.cc
Log Message:
backported lots of stuff from HEAD
Index: driverregistry.cc
===================================================================
RCS file:
/cvsroot/playerstage/code/player/server/libplayerdrivers/driverregistry.cc,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -C2 -d -r1.12 -r1.12.2.1
*** driverregistry.cc 7 Apr 2006 21:00:29 -0000 1.12
--- driverregistry.cc 7 Jun 2006 16:12:54 -0000 1.12.2.1
***************
*** 31,34 ****
--- 31,38 ----
/* prototype driver-specific init funcs */
+ #ifdef INCLUDE_ARTOOLKITPLUS
+ void ARToolkitPlusDriver_Register(DriverTable *table);
+ #endif
+
#ifdef INCLUDE_BUMPERSAFE
void BumperSafe_Register(DriverTable *table);
***************
*** 43,46 ****
--- 47,54 ----
#endif
+ #ifdef INCLUDE_RELAY
+ void Relay_Register(DriverTable* table);
+ #endif
+
#ifdef INCLUDE_VMAPFILE
void VMapFile_Register(DriverTable* table);
***************
*** 87,94 ****
--- 95,110 ----
#endif
+ #ifdef INCLUDE_WBR914
+ void wbr914_Register(DriverTable* table);
+ #endif
+
#ifdef INCLUDE_ROOMBA
void Roomba_Register(DriverTable* table);
#endif
+ #ifdef INCLUDE_GARCIA
+ void GarciaDriver_Register(DriverTable* table);
+ #endif
+
#ifdef INCLUDE_SICKPLS
void SickPLS_Register(DriverTable* table);
***************
*** 154,157 ****
--- 170,177 ----
#endif
+ #ifdef INCLUDE_LASERSAFE
+ void LaserSafe_Register(DriverTable *table);
+ #endif
+
#ifdef INCLUDE_SONYEVID30
void SonyEVID30_Register(DriverTable* table);
***************
*** 187,190 ****
--- 207,214 ----
#endif
+ #ifdef INCLUDE_ERRATIC
+ void Erratic_Register(DriverTable* table);
+ #endif
+
#ifdef INCLUDE_RFLEX
void RFLEX_Register(DriverTable* table);
***************
*** 215,222 ****
#endif
- #ifdef INCLUDE_FIXEDTONES
- void FixedTones_Register(DriverTable* table);
- #endif
-
#ifdef INCLUDE_ACOUSTICS
void Acoustics_Register(DriverTable* table);
--- 239,242 ----
***************
*** 243,250 ****
#endif
! #ifdef INCLUDE_MICA2
void Mica2_Register(DriverTable* table);
#endif
#ifdef INCLUDE_INAV
void INav_Register(DriverTable *table);
--- 263,274 ----
#endif
! #ifdef INCLUDE_MICA2
void Mica2_Register(DriverTable* table);
#endif
+ #ifdef INCLUDE_RCORE_XBRIDGE
+ void RCore_XBridge_Register(DriverTable* table);
+ #endif
+
#ifdef INCLUDE_INAV
void INav_Register(DriverTable *table);
***************
*** 275,278 ****
--- 299,306 ----
#endif
+ #ifdef INCLUDE_CAMERAUVC
+ void CameraUVC_Register(DriverTable *table);
+ #endif
+
#ifdef INCLUDE_SPHERE
void SphereDriver_Register(DriverTable *table);
***************
*** 289,292 ****
--- 317,321 ----
#ifdef INCLUDE_CAMERACOMPRESS
void CameraCompress_Register(DriverTable* table);
+ void CameraUncompress_Register(DriverTable* table);
#endif
***************
*** 334,337 ****
--- 363,370 ----
player_register_drivers()
{
+ #ifdef INCLUDE_ARTOOLKITPLUS
+ ARToolkitPlusDriver_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_BUMPERSAFE
BumperSafe_Register(driverTable);
***************
*** 346,349 ****
--- 379,386 ----
#endif
+ #ifdef INCLUDE_RELAY
+ Relay_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_VMAPFILE
VMapFile_Register(driverTable);
***************
*** 386,393 ****
--- 423,438 ----
#endif
+ #ifdef INCLUDE_GARCIA
+ GarciaDriver_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_SICKLMS200
SickLMS200_Register(driverTable);
#endif
+ #ifdef INCLUDE_WBR914
+ wbr914_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_ROOMBA
Roomba_Register(driverTable);
***************
*** 456,459 ****
--- 501,508 ----
#endif
+ #ifdef INCLUDE_LASERSAFE
+ LaserSafe_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_RFLEX
RFLEX_Register(driverTable);
***************
*** 493,498 ****
#endif
! #ifdef INCLUDE_FIXEDTONES
! FixedTones_Register(driverTable);
#endif
--- 542,547 ----
#endif
! #ifdef INCLUDE_ERRATIC
! Erratic_Register(driverTable);
#endif
***************
*** 545,552 ****
#endif
! #ifdef INCLUDE_MICA2
Mica2_Register(driverTable);
#endif
#ifdef INCLUDE_INAV
INav_Register(driverTable);
--- 594,605 ----
#endif
! #ifdef INCLUDE_MICA2
Mica2_Register(driverTable);
#endif
+ #ifdef INCLUDE_RCORE_XBRIDGE
+ RCore_XBridge_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_INAV
INav_Register(driverTable);
***************
*** 577,580 ****
--- 630,637 ----
#endif
+ #ifdef INCLUDE_CAMERAUVC
+ CameraUVC_Register(driverTable);
+ #endif
+
#ifdef INCLUDE_SPHERE
SphereDriver_Register(driverTable);
***************
*** 591,594 ****
--- 648,652 ----
#ifdef INCLUDE_CAMERACOMPRESS
CameraCompress_Register(driverTable);
+ CameraUncompress_Register(driverTable);
#endif
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
