[Libphidget-cvs-commits] CVS: libphidget/src/phidget++ CPhidgetManager.cc,1.7,1.8 CPhidgetManager.h,1.4,1.5

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

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

Modified Files:
	CPhidgetManager.cc CPhidgetManager.h 
Log Message:
I think I figured out how to not use the HID at all.  Removing what I added yesterday to start supporting HID.


Index: CPhidgetManager.cc
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CPhidgetManager.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CPhidgetManager.cc	16 Sep 2002 06:57:50 -0000	1.7
--- CPhidgetManager.cc	13 Dec 2002 16:42:34 -0000	1.8
***************
*** 75,79 ****
  {
  	METHOD_GUARD;
!     error(phidgetInit(1));
  
      /*
--- 75,80 ----
  {
  	METHOD_GUARD;
! 
! 	error(phidgetInit(1));
  
      /*

Index: CPhidgetManager.h
===================================================================
RCS file: /cvsroot/libphidget/libphidget/src/phidget++/CPhidgetManager.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** CPhidgetManager.h	12 Sep 2002 00:24:29 -0000	1.4
--- CPhidgetManager.h	13 Dec 2002 16:42:39 -0000	1.5
***************
*** 51,74 ****
  class CPhidgetManager:public TSingleton <CPhidgetManager >
  {
!   private:
!         friend class TSingleton <CPhidgetManager >;
!     friend class CPhidget;
!     friend class CUniqueDevice;
! 
!     //vector <CPhidget *> _phidgets;
!     vector <CUniqueDevice *>_uniqueDevices;
  
!     CPhidgetManager ();
!     //void addPossibleNewDevice(struct phidget *dev);
!     //void replacePhidget(CPhidget *a,CPhidget *b);
  
!     struct phidget *getDeviceHandle(const CUID &uid);
  
!     CPhidget *createPhidget(const CUID &uid);
  
!     void registerDevice(CUniqueDevice *dev);
!     void unregisterDevice(CUniqueDevice *dev);
  
!   public:
  	/**
  	 * Deletes all currently allocated phidgets, only called when the application finishes 
--- 51,74 ----
  class CPhidgetManager:public TSingleton <CPhidgetManager >
  {
! 	private:
! 	friend class TSingleton <CPhidgetManager >;
! 	friend class CPhidget;
! 	friend class CUniqueDevice;
  
! 	//vector <CPhidget *> _phidgets;
! 	vector <CUniqueDevice *>_uniqueDevices;
  
! 	CPhidgetManager ();
! 	//void addPossibleNewDevice(struct phidget *dev);
! 	//void replacePhidget(CPhidget *a,CPhidget *b);
! 	
! 	struct phidget *getDeviceHandle(const CUID &uid);
  
! 	CPhidget *createPhidget(const CUID &uid);
  
! 	void registerDevice(CUniqueDevice *dev);
! 	void unregisterDevice(CUniqueDevice *dev);
  
! 	public:
  	/**
  	 * Deletes all currently allocated phidgets, only called when the application finishes 
***************
*** 78,99 ****
  	 * be called.
  	 */
!         virtual ~ CPhidgetManager ();
  
!     // Discovery functions
  
  	/**
! 	 * Returns a list of know devices currently available
! 	 */
!     vector <CUID >query(const EDeviceClass tp = LP_PHIDGET);
  
  	/**
! 	 * Get a vector of all phidgets
! 	 */
!     //const vector<CPhidget *> &phidgets() const;
  
  	/** 
  	 * Returns a phidget by it's unique ID or NULL if it is not attached
! 	 */
!     CPhidget *phidget (const CUID &uid	//<! Unique ID of phidget
  	);
  
--- 78,99 ----
  	 * be called.
  	 */
! 	virtual ~ CPhidgetManager ();
  
! 	// Discovery functions
  
  	/**
!  	* Returns a list of know devices currently available
!  	*/
! 	vector <CUID >query(const EDeviceClass tp = LP_PHIDGET);
  
  	/**
!  	 * Get a vector of all phidgets
!  	 */
! 	//const vector<CPhidget *> &phidgets() const;
  
  	/** 
  	 * Returns a phidget by it's unique ID or NULL if it is not attached
!  	 */
! 	CPhidget *phidget (const CUID &uid	//<! Unique ID of phidget
  	);