[Libphidget-cvs-commits] CVS: libphidget/src/phidget++ CPhidgetManager.cc,1.8,1.9

[Jack S. <js...@us...>]

Update of /cvsroot/libphidget/libphidget/src/phidget++
In directory sc8-pr-cvs1:/tmp/cvs-serv23320/phidget++

Modified Files:
	CPhidgetManager.cc 
Log Message:
Removed the INTERFACE_KIT class.  Not used anymore


Index: CPhidgetManager.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CPhidgetManager.cc,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** CPhidgetManager.cc	13 Dec 2002 16:42:34 -0000	1.8
--- CPhidgetManager.cc	13 Dec 2002 22:53:57 -0000	1.9
***************
*** 118,138 ****
  
      // Ask libphidget for any known phidgets
!     if (tp == LP_ALL || tp == LP_PHIDGET || tp == LP_SERVO_CONTROLLER || tp == LP_INTERFACE_KIT) {
  	int phidget_count;
  	struct phidget **phidgets = error(phidgetGetPhidgets(&phidget_count));
  
  
! 	for (int t = 0; t < phidget_count; t++) {
! 	    if (
! 		(tp == LP_PHIDGET) ||
! 		(tp == LP_ALL) ||
! 		(tp == LP_SERVO_CONTROLLER
! 		 && error(phidgetTypeDeviceClass(error(phidgetType(phidgets[t])))) ==
! 		 LP_SERVO_CONTROLLER) || (tp == LP_INTERFACE_KIT
! 					  && error(phidgetTypeDeviceClass(error(phidgetType(phidgets[t])))) == LP_INTERFACE_KIT)) {
! 		CUID temp_uid(error(phidgetSerial(phidgets[t])));
  
! 		devices.insert(temp_uid);
! 	    }
  	}
      }
--- 118,138 ----
  
      // Ask libphidget for any known phidgets
!     if (tp == LP_ALL || tp == LP_PHIDGET || tp == LP_SERVO_CONTROLLER /*|| tp == LP_INTERFACE_KIT*/) {
  	int phidget_count;
  	struct phidget **phidgets = error(phidgetGetPhidgets(&phidget_count));
  
  
! 	for (int t = 0; t < phidget_count; t++) 
! 	{
! 		if (
! 			(tp == LP_PHIDGET) ||
! 			(tp == LP_ALL) ||
! 			(tp == LP_SERVO_CONTROLLER && error(phidgetTypeDeviceClass(error(phidgetType(phidgets[t])))) == LP_SERVO_CONTROLLER) /*|| 
! 			(tp == LP_INTERFACE_KIT && error(phidgetTypeDeviceClass(error(phidgetType(phidgets[t])))) == LP_INTERFACE_KIT)*/ ) 
! 		{
! 			CUID temp_uid(error(phidgetSerial(phidgets[t])));
  
! 			devices.insert(temp_uid);
! 		}
  	}
      }