[Playerstage-commit] SF.net SVN: playerstage:[7934] code/gazebo/trunk

[natepak]

Revision: 7934
          http://playerstage.svn.sourceforge.net/playerstage/?rev=7934&view=rev
Author:   natepak
Date:     2009-07-01 15:37:14 +0000 (Wed, 01 Jul 2009)

Log Message:
-----------
Fixed compilation of openal controller

Modified Paths:
--------------
    code/gazebo/trunk/libgazebo/Server.cc
    code/gazebo/trunk/server/controllers/CMakeLists.txt
    code/gazebo/trunk/server/controllers/audio/Audio.cc
    code/gazebo/trunk/server/controllers/audio/Audio.hh
    code/gazebo/trunk/webgazebo/WebGazebo.hh

Modified: code/gazebo/trunk/libgazebo/Server.cc
===================================================================
--- code/gazebo/trunk/libgazebo/Server.cc       2009-07-01 09:04:05 UTC (rev 
7933)
+++ code/gazebo/trunk/libgazebo/Server.cc       2009-07-01 15:37:14 UTC (rev 
7934)
@@ -106,7 +106,7 @@
     if(fp) 
     {
       int pid = 0;
-      fscanf(fp, "%d", &pid);
+      int result = fscanf(fp, "%d", &pid);
       fclose(fp);
       
       if (pid != 0)

Modified: code/gazebo/trunk/server/controllers/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/controllers/CMakeLists.txt 2009-07-01 09:04:05 UTC 
(rev 7933)
+++ code/gazebo/trunk/server/controllers/CMakeLists.txt 2009-07-01 15:37:14 UTC 
(rev 7934)
@@ -10,11 +10,8 @@
 ADD_SUBDIRECTORY(opaque)
 ADD_SUBDIRECTORY(position2d)
 ADD_SUBDIRECTORY(ptz)
+ADD_SUBDIRECTORY(audio)
 
-IF (INCLUDE_AV)
-  ADD_SUBDIRECTORY(audio)
-ENDIF (INCLUDE_AV)
-
 SET (sources Controller.cc 
              ControllerFactory.cc
 )

Modified: code/gazebo/trunk/server/controllers/audio/Audio.cc
===================================================================
--- code/gazebo/trunk/server/controllers/audio/Audio.cc 2009-07-01 09:04:05 UTC 
(rev 7933)
+++ code/gazebo/trunk/server/controllers/audio/Audio.cc 2009-07-01 15:37:14 UTC 
(rev 7934)
@@ -36,6 +36,8 @@
 
 #include <string.h>
 
+#ifdef HAVE_OPENAL
+
 using namespace gazebo;
 
 GZ_REGISTER_STATIC_CONTROLLER("audio", AudioController);
@@ -160,3 +162,5 @@
     this->audioIface->Unlock();
   }
 }
+
+#endif

Modified: code/gazebo/trunk/server/controllers/audio/Audio.hh
===================================================================
--- code/gazebo/trunk/server/controllers/audio/Audio.hh 2009-07-01 09:04:05 UTC 
(rev 7933)
+++ code/gazebo/trunk/server/controllers/audio/Audio.hh 2009-07-01 15:37:14 UTC 
(rev 7934)
@@ -26,10 +26,13 @@
 #ifndef AUDIOCONTROLLER_HH
 #define AUDIOCONTROLLER_HH
 
+#include "config.h"
 
 #include "Controller.hh"
 #include "Entity.hh"
 
+#ifdef HAVE_OPENAL
+
 namespace gazebo
 {
   class Model;
@@ -99,4 +102,5 @@
 }
 
 #endif
+#endif
 

Modified: code/gazebo/trunk/webgazebo/WebGazebo.hh
===================================================================
--- code/gazebo/trunk/webgazebo/WebGazebo.hh    2009-07-01 09:04:05 UTC (rev 
7933)
+++ code/gazebo/trunk/webgazebo/WebGazebo.hh    2009-07-01 15:37:14 UTC (rev 
7934)
@@ -36,7 +36,7 @@
            double dtol, double atol);
   virtual ~WebGazebo();
 
-    bool Go(double t);
+  bool Go(double t);
   
   // start WebSim Interface 
============================================================
   


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
_______________________________________________
Playerstage-commit mailing list
Playerstage-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/playerstage-commit