[Robotflow-cvs] RobotFlow/Player/include Makefile.am,1.3,1.4 PlayerConnect.h,1.6,1.7

[Dominic L?t. <ma...@us...>]

Update of /cvsroot/robotflow/RobotFlow/Player/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30362/Player/include

Modified Files:
	Makefile.am PlayerConnect.h 
Log Message:
watch out, a lot of things have been modified in the installation structure, Player and librairies

Index: PlayerConnect.h
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/include/PlayerConnect.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PlayerConnect.h	4 Dec 2003 18:48:36 -0000	1.6
--- PlayerConnect.h	27 May 2004 00:27:39 -0000	1.7
***************
*** 30,33 ****
--- 30,34 ----
    GripperProxy *m_gripperProxy;
    LaserProxy *m_laserProxy;
+   LaserProxy *m_laser2Proxy;
    PtzProxy *m_ptzProxy;
    SonarProxy *m_sonarProxy;
***************
*** 39,43 ****
  		     bool startLaserProxy, bool startPTZProxy,
  		     bool startSonarProxy, bool startBlobFinderProxy,
! 		     bool startGPSProxy)
    {
  
--- 40,44 ----
  		     bool startLaserProxy, bool startPTZProxy,
  		     bool startSonarProxy, bool startBlobFinderProxy,
! 		     bool startGPSProxy, bool startLaser2Proxy)
    {
  
***************
*** 71,74 ****
--- 72,79 ----
         m_gpsProxy =  new GpsProxy(&m_client,0,'a');
      }
+     if(startLaser2Proxy)
+     {
+        m_laser2Proxy = new LaserProxy(&m_client,1,'a');
+     }
    }
  
***************
*** 88,120 ****
      }
  
!     if (m_laserProxy) 
      {
         delete m_laserProxy;
         m_laserProxy = NULL;
      }
!     
!     if (m_ptzProxy) 
      {
         delete m_ptzProxy;
         m_ptzProxy = NULL;
      }
!     
!     if (m_sonarProxy) 
      {
         delete m_sonarProxy;
         m_sonarProxy = NULL;
      }
!     
!     if (m_blobFinderProxy) 
      {
         delete m_blobFinderProxy;
         m_blobFinderProxy = NULL;
      }
!     
!     if (m_gpsProxy) 
      {
         delete m_gpsProxy;
         m_gpsProxy = NULL;
      }
    }
  
--- 93,131 ----
      }
  
!     if (m_laserProxy)
      {
         delete m_laserProxy;
         m_laserProxy = NULL;
      }
! 
!     if (m_ptzProxy)
      {
         delete m_ptzProxy;
         m_ptzProxy = NULL;
      }
! 
!     if (m_sonarProxy)
      {
         delete m_sonarProxy;
         m_sonarProxy = NULL;
      }
! 
!     if (m_blobFinderProxy)
      {
         delete m_blobFinderProxy;
         m_blobFinderProxy = NULL;
      }
! 
!     if (m_gpsProxy)
      {
         delete m_gpsProxy;
         m_gpsProxy = NULL;
      }
+ 
+     if (m_laser2Proxy)
+     {
+        delete m_laser2Proxy;
+        m_laser2Proxy = NULL;
+     }
    }
  
***************
*** 125,137 ****
  		   bool startLaserProxy = true, bool startPTZProxy = true,
  		   bool startSonarProxy = true, bool startBlobFinderProxy = true,
! 		   bool startGPSProxy = true)
      : m_client(hostname,port), m_positionProxy(NULL),
!     m_gripperProxy(NULL), m_laserProxy(NULL), m_ptzProxy(NULL), 
!     m_sonarProxy (NULL), m_blobFinderProxy(NULL), m_gpsProxy(NULL)
    {
  
      createProxies(startPositionProxy, startGripperProxy, startLaserProxy,
                    startPTZProxy,startSonarProxy, startBlobFinderProxy,
! 		  startGPSProxy);
  
    }
--- 136,148 ----
  		   bool startLaserProxy = true, bool startPTZProxy = true,
  		   bool startSonarProxy = true, bool startBlobFinderProxy = true,
! 		   bool startGPSProxy = true, bool startLaser2Proxy = true)
      : m_client(hostname,port), m_positionProxy(NULL),
!     m_gripperProxy(NULL), m_laserProxy(NULL), m_ptzProxy(NULL),
!     m_sonarProxy (NULL), m_blobFinderProxy(NULL), m_gpsProxy(NULL), m_laser2Proxy(NULL)
    {
  
      createProxies(startPositionProxy, startGripperProxy, startLaserProxy,
                    startPTZProxy,startSonarProxy, startBlobFinderProxy,
! 		  startGPSProxy, startLaser2Proxy);
  
    }
***************
*** 148,152 ****
  
    PtzProxy * getPtzProxy() {return m_ptzProxy;}
!   
    SonarProxy *getSonarProxy() {return m_sonarProxy;}
  
--- 159,163 ----
  
    PtzProxy * getPtzProxy() {return m_ptzProxy;}
! 
    SonarProxy *getSonarProxy() {return m_sonarProxy;}
  
***************
*** 155,159 ****
    GpsProxy * getGpsProxy() {return m_gpsProxy;}
  
!   
    // check if we are connected
    bool Connected() { return (m_client.Connected());}
--- 166,171 ----
    GpsProxy * getGpsProxy() {return m_gpsProxy;}
  
!   LaserProxy * getLaser2Proxy() {return m_laser2Proxy;}
! 
    // check if we are connected
    bool Connected() { return (m_client.Connected());}
***************
*** 196,199 ****
--- 208,212 ----
    bool m_startGripperProxy;
    bool m_startLaserProxy;
+   bool m_startLaser2Proxy;
    bool m_startPTZProxy;
    bool m_startSonarProxy;

Index: Makefile.am
===================================================================
RCS file: /cvsroot/robotflow/RobotFlow/Player/include/Makefile.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Makefile.am	26 May 2004 18:48:54 -0000	1.3
--- Makefile.am	27 May 2004 00:27:25 -0000	1.4
***************
*** 2,3 ****
--- 2,5 ----
  
  noinst_HEADERS = PlayerConnect.h
+ 
+