Add support for AeonWave

diff --git a/CMakeLists.txt b/CMakeLists.txt
index de0b23cfa364b31730ca0dc72e80ed354bfc1060..256c1836bfdf218f34971c454c8df326920bdb20 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -175,6 +175,7 @@ option(ENABLE_PROFILE    "Set to ON to build FlightGear with gperftools profilin
 option(SYSTEM_SQLITE     "Set to ON to build FlightGear with the system's SQLite3 library" OFF)
 option(ENABLE_IAX        "Set to ON to build FlightGear with IAXClient/fgcom built-in (default)" ON)
 option(USE_DBUS          "Set to ON to build FlightGear with DBus screensaver interaction (default on Linux)" ${USE_DBUS_DEFAULT})
+option(USE_AEONWAVE      "Set to ON to use AeonWave instead of OpenAL" ON)
 option(SYSTEM_SPEEX      "Set to ON to build IAXClient with the system's speex and speexdsp library" ${SYSTEM_SPEEX_DEFAULT})
 option(SYSTEM_GSM        "Set to ON to build IAXClient with the system's GSM library" ${SYSTEM_GSM_DEFAULT})
 option(SYSTEM_FLITE      "Set to ON to build Flightgear with the system's Flite library" ${SYSTEM_FLITE_DEFAULT})
@@ -383,11 +384,21 @@ include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
     ${Boost_INCLUDE_DIRS}
     ${ZLIB_INCLUDE_DIR}
     ${OPENGL_INCLUDE_DIR}
-    ${OPENAL_INCLUDE_DIR}
     ${SIMGEAR_INCLUDE_DIRS}
     ${PLIB_INCLUDE_DIR}
     ${SQLITE3_INCLUDED_DIR} )
 
+if (USE_AEONWAVE)
+    find_package(AAX COMPONENTS aax REQUIRED)
+    include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
+        ${AAX_INCLUDE_DIR}
+    )
+else()
+    include_directories(${OPENSCENEGRAPH_INCLUDE_DIRS}
+        ${OPENAL_INCLUDE_DIR}
+    )
+endif()
+
 include_directories(${PROJECT_SOURCE_DIR})
 include_directories(${PROJECT_SOURCE_DIR}/src)
 # following is needed, because config.h is include 'bare', whereas

diff --git a/CMakeModules/ConfigureMsvc3rdParty.cmake b/CMakeModules/ConfigureMsvc3rdParty.cmake
index ecfea56d4ab422f1c2b30d59316766732615775e..9bf10ada287055c306f90fd4a0cba821977fd6c1 100644 (file)
--- a/CMakeModules/ConfigureMsvc3rdParty.cmake
+++ b/CMakeModules/ConfigureMsvc3rdParty.cmake
@@ -57,6 +57,10 @@ if (MSVC AND MSVC_3RDPARTY_ROOT)
                        ${MSVC_3RDPARTY_ROOT}/boost_1_44_0
                        )
     message(STATUS "BOOST_ROOT is ${BOOST_ROOT}")
-    set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
-    set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
+    if (USE_AEONWAVE)
+      find_package(AAX COMPONENTS aax REQUIRED)
+    else()
+      set (OPENAL_INCLUDE_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/include)
+      set (OPENAL_LIBRARY_DIR ${MSVC_3RDPARTY_ROOT}/${MSVC_3RDPARTY_DIR}/lib)
+    endif()
 endif (MSVC AND MSVC_3RDPARTY_ROOT)

diff --git a/CMakeModules/FindSimGear.cmake b/CMakeModules/FindSimGear.cmake
index 1cfb7da9ac2bb54fa6b45b6788db2eb3775b438d..e9fd2958b2c21e5167b7d63d4d7009c5fc1365b4 100644 (file)
--- a/CMakeModules/FindSimGear.cmake
+++ b/CMakeModules/FindSimGear.cmake
@@ -148,8 +148,13 @@ else(SIMGEAR_SHARED)
         ${ZLIB_LIBRARY}
         ${WINMM_LIBRARY})
 
-    set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
-        ${OPENAL_LIBRARY})
+    if (USE_AEONWAVE)
+        set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
+            ${AAX_LIBRARY})
+    else()
+        set(SIMGEAR_SCENE_LIBRARY_DEPENDENCIES
+            ${OPENAL_LIBRARY})
+    endif()
 
     if(APPLE)
         find_library(COCOA_LIBRARY Cocoa)

diff --git a/src/Environment/fgclouds.cxx b/src/Environment/fgclouds.cxx
index 58653e05364c3dce780ab2695d3f308743ff8406..13e2e1d1ca0d5dc993ef600af6caa93a7fdebef0 100644 (file)
--- a/src/Environment/fgclouds.cxx
+++ b/src/Environment/fgclouds.cxx
@@ -31,7 +31,7 @@
 #include <Main/fg_props.hxx>
 
 #include <simgear/constants.h>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/scene/sky/sky.hxx>
 //#include <simgear/environment/visual_enviro.hxx>
 #include <simgear/scene/sky/cloudfield.hxx>

diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx
index 5c18cf063637dc31b59e0e07186917bea91d286e..5d27ef996ff5f54dc99e5974ac4c997cd3da94c1 100644 (file)
--- a/src/Instrumentation/mk_viii.cxx
+++ b/src/Instrumentation/mk_viii.cxx
@@ -74,7 +74,7 @@
 #include <simgear/math/SGLineSegment.hxx>
 #include <simgear/math/SGIntersect.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/sample_group.hxx>
 #include <simgear/structure/exception.hxx>
 

diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx
index ce16ce5a44dcef510bd7c3c14773a3efb2c227b9..c06e3ffd01fb70d570064aa84b581e39d7e21ac9 100644 (file)
--- a/src/Instrumentation/tcas.cxx
+++ b/src/Instrumentation/tcas.cxx
@@ -100,7 +100,7 @@
 #include <simgear/sg_inlines.h>
 #include <simgear/debug/logstream.hxx>
 #include <simgear/math/sg_geodesy.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/sample_group.hxx>
 #include <simgear/structure/exception.hxx>
 

diff --git a/src/Main/fg_commands.cxx b/src/Main/fg_commands.cxx
index ab8760693d4de4102ae05838ab72c283c57ef7ff..8408b63d9cb3e2151fd5a8a813334e180bf905d9 100644 (file)
--- a/src/Main/fg_commands.cxx
+++ b/src/Main/fg_commands.cxx
@@ -22,7 +22,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/structure/event_mgr.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/timing/sg_time.hxx>
 #include <Network/RemoteXMLRequest.hxx>
 

diff --git a/src/Main/fg_props.cxx b/src/Main/fg_props.cxx
index e4bff808cdd79310df2b53f0d60f3ec56d894384..e4d716bcc0899566ff7e865042e18ed5a549c918 100644 (file)
--- a/src/Main/fg_props.cxx
+++ b/src/Main/fg_props.cxx
@@ -31,7 +31,7 @@
 #include <simgear/timing/sg_time.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/model/particles.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 
 #include <GUI/gui.h>
 

diff --git a/src/Main/globals.cxx b/src/Main/globals.cxx
index 1c83f36d94431126905e1d20ad13d372ae2c25bd..e65815ac70eecfc5fd098770679fa38f4d4ed858 100644 (file)
--- a/src/Main/globals.cxx
+++ b/src/Main/globals.cxx
@@ -38,7 +38,7 @@
 #include <simgear/scene/material/matlib.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
 #include <simgear/structure/event_mgr.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/misc/ResourceManager.hxx>
 #include <simgear/props/propertyObject.hxx>
 #include <simgear/props/props_io.hxx>

diff --git a/src/Main/options.cxx b/src/Main/options.cxx
index 3ac5d2eecb6a33a3e5934df4a242b87582b9d8ad..f7b80410d08071a217352d43cc21576b4bec1eb8 100644 (file)
--- a/src/Main/options.cxx
+++ b/src/Main/options.cxx
@@ -48,7 +48,7 @@
 #include <simgear/misc/sgstream.hxx>
 #include <simgear/misc/sg_path.hxx>
 #include <simgear/scene/material/mat.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/misc/strutils.hxx>
 #include <Autopilot/route_mgr.hxx>
 #include <Aircraft/replay.hxx>

diff --git a/src/Sound/audioident.hxx b/src/Sound/audioident.hxx
index 3fcc7cd52bbaedcef0ee0890c642875d7be4b6cd..54cc5fe8f7b032dbaaa04d2af1ee6d2451cca3dd 100644 (file)
--- a/src/Sound/audioident.hxx
+++ b/src/Sound/audioident.hxx
@@ -28,7 +28,7 @@
 #endif
 
 #include <string>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 
 class AudioIdent {
 public:

diff --git a/src/Sound/beacon.hxx b/src/Sound/beacon.hxx
index a85244f9bb099cabaf2dac8fa1dd90b1d61c5181..3903bae48cbfa0099b76130eb8923f10255fa997 100644 (file)
--- a/src/Sound/beacon.hxx
+++ b/src/Sound/beacon.hxx
@@ -27,7 +27,7 @@
 #include "soundgenerator.hxx"
 
 #include <simgear/compiler.h>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/structure/SGReferenced.hxx>
 #include <simgear/structure/SGSharedPtr.hxx>
 

diff --git a/src/Sound/fg_fx.cxx b/src/Sound/fg_fx.cxx
index 1e358b00d7ff7e6a6369e4e93a27d2066248cdfc..6b4f92d890cf670bc63a60e73a652ea327418166 100644 (file)
--- a/src/Sound/fg_fx.cxx
+++ b/src/Sound/fg_fx.cxx
@@ -37,7 +37,7 @@
 #include <simgear/props/props.hxx>
 #include <simgear/props/props_io.hxx>
 #include <simgear/misc/sg_path.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/xmlsound.hxx>
 
 FGFX::FGFX ( const std::string &refname, SGPropertyNode *props ) :

diff --git a/src/Sound/flitevoice.hxx b/src/Sound/flitevoice.hxx
index 1b95547fa86ceadb23d118ecc56695eec8a49496..18ed0de276c32ff283b29c147de589b6383e33d9 100644 (file)
--- a/src/Sound/flitevoice.hxx
+++ b/src/Sound/flitevoice.hxx
@@ -24,7 +24,7 @@
 #define _FLITEVOICE_HXX
 
 #include "voice.hxx"
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/sample.hxx>
 #include <simgear/threads/SGQueue.hxx>
 

diff --git a/src/Sound/morse.hxx b/src/Sound/morse.hxx
index 1f54fa81ddde0ed85ac15fd517efd50e75646649..e2e6597b8713283201ca7faa0875bc460d8b8cb5 100644 (file)
--- a/src/Sound/morse.hxx
+++ b/src/Sound/morse.hxx
@@ -25,7 +25,7 @@
 
 #include "soundgenerator.hxx"
 #include <simgear/compiler.h>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 
 
 // Quoting from http://www.kluft.com/~ikluft/ham/morse-intro.html by

diff --git a/src/Sound/sample_queue.cxx b/src/Sound/sample_queue.cxx
index 7295b341ce1f9ba9eb040d1fe2588be3f86dab30..267bee3c98c14aafa5e997e7f02b91fd4a8feaf6 100644 (file)
--- a/src/Sound/sample_queue.cxx
+++ b/src/Sound/sample_queue.cxx
@@ -33,7 +33,7 @@
 
 #include <Main/fg_props.hxx>
 
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/sample.hxx>
 
 FGSampleQueue::FGSampleQueue ( SGSoundMgr *smgr, const std::string &refname ) :

diff --git a/src/Sound/soundmanager.cxx b/src/Sound/soundmanager.cxx
index 85d1c0cc0bfc97710ce373f3541d24ccc4c70ef7..bc0107e5a6ab364cf6870e822a9a735997919b6a 100644 (file)
--- a/src/Sound/soundmanager.cxx
+++ b/src/Sound/soundmanager.cxx
@@ -21,7 +21,7 @@
 #  include <config.h>
 #endif
 
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/structure/commands.hxx>
 
 #if defined(ENABLE_FLITE)

diff --git a/src/Sound/soundmanager.hxx b/src/Sound/soundmanager.hxx
index 8a9f6f5de9a4874d845303105956837d9429dee5..6e7146800c181396be663aa0c5f4f1fc883f667b 100644 (file)
--- a/src/Sound/soundmanager.hxx
+++ b/src/Sound/soundmanager.hxx
@@ -24,7 +24,7 @@
 #include <map>
 #include <simgear/props/props.hxx>
 #include <simgear/structure/subsystem_mgr.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 
 class FGSampleQueue;
 class SGSoundMgr;

diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx
index c4ca5d2bdb33e2b54df71be1c9d729d977ad540b..954562a1356b43f7e835b1cbdfd4663feee60b44 100644 (file)
--- a/src/Sound/voiceplayer.cxx
+++ b/src/Sound/voiceplayer.cxx
@@ -39,7 +39,7 @@
 #include <sstream>
 
 #include <simgear/debug/logstream.hxx>
-#include <simgear/sound/soundmgr_openal.hxx>
+#include <simgear/sound/soundmgr.hxx>
 #include <simgear/sound/sample_group.hxx>
 #include <simgear/structure/exception.hxx>