Revision: 7663
http://playerstage.svn.sourceforge.net/playerstage/?rev=7663&view=rev
Author: natepak
Date: 2009-05-14 16:41:37 +0000 (Thu, 14 May 2009)
Log Message:
-----------
Added gazebo_av library
Modified Paths:
--------------
code/gazebo/trunk/server/CMakeLists.txt
code/gazebo/trunk/server/audio_video/CMakeLists.txt
code/gazebo/trunk/server/audio_video/OpenAL.cc
code/gazebo/trunk/server/audio_video/OpenAL.hh
Modified: code/gazebo/trunk/server/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/CMakeLists.txt 2009-05-14 15:55:25 UTC (rev
7662)
+++ code/gazebo/trunk/server/CMakeLists.txt 2009-05-14 16:41:37 UTC (rev
7663)
@@ -114,6 +114,7 @@
${boost_libraries}
${freeimage_library}
gazebo_server
+ gazebo_av
gazebo_gui
gazebo
)
Modified: code/gazebo/trunk/server/audio_video/CMakeLists.txt
===================================================================
--- code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 15:55:25 UTC
(rev 7662)
+++ code/gazebo/trunk/server/audio_video/CMakeLists.txt 2009-05-14 16:41:37 UTC
(rev 7663)
@@ -6,7 +6,11 @@
OpenAL.hh
)
-APPEND_TO_SERVER_SOURCES(${sources})
-APPEND_TO_SERVER_HEADERS(${headers})
+#APPEND_TO_SERVER_SOURCES(${sources})
+#APPEND_TO_SERVER_HEADERS(${headers})
-#ADD_LIBRARY(gazebo_av STATIC ${sources})
+ADD_LIBRARY(gazebo_av STATIC ${sources})
+ADD_LIBRARY(gazebo_av-shared SHARED ${sources})
+
+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 15:55:25 UTC
(rev 7662)
+++ code/gazebo/trunk/server/audio_video/OpenAL.cc 2009-05-14 16:41:37 UTC
(rev 7663)
@@ -28,7 +28,10 @@
#include <unistd.h>
#include <iostream>
+
+#include <AL/al.h>
#include <AL/alc.h>
+#include <AL/alext.h>
#include "XMLConfig.hh"
#include "GazeboError.hh"
Modified: code/gazebo/trunk/server/audio_video/OpenAL.hh
===================================================================
--- code/gazebo/trunk/server/audio_video/OpenAL.hh 2009-05-14 15:55:25 UTC
(rev 7662)
+++ code/gazebo/trunk/server/audio_video/OpenAL.hh 2009-05-14 16:41:37 UTC
(rev 7663)
@@ -27,15 +27,14 @@
#ifndef OPENAL_HH
#define OPENAL_HH
-#include <AL/al.h>
-#include <AL/alc.h>
-#include <AL/alext.h>
-
#include <stdint.h>
#include <string>
#include "Vector3.hh"
+struct ALCcontext_struct;
+struct ALCdevice_struct;
+
namespace gazebo
{
@@ -78,8 +77,8 @@
public: void SetListenerOrient(float cx, float cy, float cz,
float ux, float uy, float uz);
- private: ALCcontext *context;
- private: ALCdevice *audioDevice;
+ private: ALCcontext_struct *context;
+ private: ALCdevice_struct *audioDevice;
private: static OpenAL *myself;
};
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
