Revision: 7667
http://playerstage.svn.sourceforge.net/playerstage/?rev=7667&view=rev
Author: natepak
Date: 2009-05-14 20:19:07 +0000 (Thu, 14 May 2009)
Log Message:
-----------
Updates to openal
Modified Paths:
--------------
code/gazebo/trunk/server/GuiAPI.hh
code/gazebo/trunk/server/OpenALAPI.cc
code/gazebo/trunk/server/OpenALAPI.hh
code/gazebo/trunk/server/audio_video/CMakeLists.txt
code/gazebo/trunk/server/audio_video/OpenAL.cc
code/gazebo/trunk/server/audio_video/OpenAL.hh
code/gazebo/trunk/server/controllers/audio/Audio.cc
code/gazebo/trunk/server/controllers/audio/Audio.hh
Modified: code/gazebo/trunk/server/GuiAPI.hh
===================================================================
--- code/gazebo/trunk/server/GuiAPI.hh 2009-05-14 18:59:59 UTC (rev 7666)
+++ code/gazebo/trunk/server/GuiAPI.hh 2009-05-14 20:19:07 UTC (rev 7667)
@@ -24,6 +24,9 @@
* SVN: $Id:$
*/
+#ifndef GUIAPI_HH
+#define GUIAPI_HH
+
#include <string>
#include <iostream>
@@ -54,5 +57,6 @@
private: Gui *gui;
};
+}
-}
+#endif
Modified: code/gazebo/trunk/server/OpenALAPI.cc
===================================================================
--- code/gazebo/trunk/server/OpenALAPI.cc 2009-05-14 18:59:59 UTC (rev
7666)
+++ code/gazebo/trunk/server/OpenALAPI.cc 2009-05-14 20:19:07 UTC (rev
7667)
@@ -41,3 +41,4 @@
OpenAL::Instance()->Fini( );
#endif
}
+
Modified: code/gazebo/trunk/server/OpenALAPI.hh
===================================================================
--- code/gazebo/trunk/server/OpenALAPI.hh 2009-05-14 18:59:59 UTC (rev
7666)
+++ code/gazebo/trunk/server/OpenALAPI.hh 2009-05-14 20:19:07 UTC (rev
7667)
@@ -24,8 +24,12 @@
* SVN: $Id$
*/
+#ifndef OPENALAPI_HH
+#define OPENALAPI_HH
+
namespace gazebo
{
+ class OpenALSource;
class XMLConfigNode;
class OpenALAPI
@@ -42,7 +46,16 @@
/// \brief Initialize
public: void Init();
+ /// \brief Create an OpenALSource object from XML node
+ /// \param node The XML config node containing the auiod information
+ /// \return A pointer to an OpenALSource object
+ //public: OpenALSource *CreateSource( XMLConfigNode *node );
+
/// \brief Finalize
public: void Fini();
};
+
+
}
+
+#endif
Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 18:59:59 UTC
(rev 7666)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 20:19:07 UTC
(rev 7667)
@@ -1,3 +1,11 @@
+INCLUDE_DIRECTORIES(
+ ${OAL_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES(
+ ${OAL_LIBRARY_DIRS}
+)
+
SET (sources AudioDecoder.cc
OpenAL.cc
)
@@ -12,5 +20,8 @@
ADD_LIBRARY(gazebo_av STATIC ${sources})
ADD_LIBRARY(gazebo_av-shared SHARED ${sources})
+TARGET_LINK_LIBRARIES(gazebo_av ${OAL_LIBRARIES})
+TARGET_LINK_LIBRARIES(gazebo_av-shared ${OAL_LIBRARIES})
+
SET_TARGET_PROPERTIES(gazebo_av-shared PROPERTIES OUTPUT_NAME "gazebo_av")
INSTALL (TARGETS gazebo_av gazebo_av-shared DESTINATION
${CMAKE_INSTALL_PREFIX}/lib)
Modified: code/gazebo/trunk/server/audio_video/OpenAL.cc
===================================================================
--- code/gazebo/trunk/server/audio_video/OpenAL.cc 2009-05-14 18:59:59 UTC
(rev 7666)
+++ code/gazebo/trunk/server/audio_video/OpenAL.cc 2009-05-14 20:19:07 UTC
(rev 7667)
@@ -240,8 +240,6 @@
}
-
-
////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////
// OPENAL SOURCE
Modified: code/gazebo/trunk/server/audio_video/OpenAL.hh
===================================================================
--- code/gazebo/trunk/server/audio_video/OpenAL.hh 2009-05-14 18:59:59 UTC
(rev 7666)
+++ code/gazebo/trunk/server/audio_video/OpenAL.hh 2009-05-14 20:19:07 UTC
(rev 7667)
@@ -83,7 +83,6 @@
private: static OpenAL *myself;
};
-
/// \brief OpenAL Source. This can be thought of as a speaker.
class OpenALSource
{
Modified: code/gazebo/trunk/server/controllers/audio/Audio.cc
===================================================================
--- code/gazebo/trunk/server/controllers/audio/Audio.cc 2009-05-14 18:59:59 UTC
(rev 7666)
+++ code/gazebo/trunk/server/controllers/audio/Audio.cc 2009-05-14 20:19:07 UTC
(rev 7667)
@@ -31,6 +31,7 @@
#include "gazebo.h"
#include "GazeboError.hh"
#include "ControllerFactory.hh"
+#include "OpenAL.hh"
#include "Audio.hh"
#include <string.h>
Modified: code/gazebo/trunk/server/controllers/audio/Audio.hh
===================================================================
--- code/gazebo/trunk/server/controllers/audio/Audio.hh 2009-05-14 18:59:59 UTC
(rev 7666)
+++ code/gazebo/trunk/server/controllers/audio/Audio.hh 2009-05-14 20:19:07 UTC
(rev 7667)
@@ -29,7 +29,6 @@
#include "Controller.hh"
#include "Entity.hh"
-#include "OpenAL.hh"
namespace gazebo
{
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The NEW KODAK i700 Series Scanners deliver under ANY circumstances! Your
production scanning environment may not be a perfect world - but thanks to
Kodak, there's a perfect scanner to get the job done! With the NEW KODAK i700
Series Scanner you'll get full speed at 300 dpi even with all image
processing features enabled. http://p.sf.net/sfu/kodak-com
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
