xrSound: add to Linux build

Author: eagleivg

Externals/openal/include/openal/alc.h

@@ -272,9 +272,10 @@ typedef void           (ALC_APIENTRY *LPALCCAPTURESAMPLES)( ALCdevice *device, A
 }
 #endif
 
+#if defined(_WIN32) && !defined(_XBOX)
 typedef void __cdecl log_fn_ptr_type(char*);
 extern ALC_API log_fn_ptr_type*	pLog ;
-
+#endif
 void AlLog(char* format, ...);
 
 #endif /* AL_ALC_H */

src/CMakeLists.txt

@@ -10,4 +10,4 @@ add_subdirectory(xrCore)
 #add_subdirectory(xrParticles)
 #add_subdirectory(xrPhysics)
 add_subdirectory(xrScriptEngine)
-#add_subdirectory(xrSound)
+add_subdirectory(xrSound)

src/xrServerEntities/ai_sounds.h

@@ -13,6 +13,7 @@
 
 enum ESoundTypes
 {
+#if defined(WINDOWS)
     SOUND_TYPE_NO_SOUND = 0x00000000ui32,
 
     SOUND_TYPE_WEAPON = 0x80000000ui32,
@@ -45,6 +46,40 @@ enum ESoundTypes
     SOUND_TYPE_OBJECT_COLLIDING = 0x00000200ui32,
     SOUND_TYPE_OBJECT_EXPLODING = 0x00000100ui32,
     SOUND_TYPE_AMBIENT = 0x00000080ui32,
+#elif defined(LINUX)
+    SOUND_TYPE_NO_SOUND = 0x00000000,
+
+    SOUND_TYPE_WEAPON = 0x80000000,
+    SOUND_TYPE_ITEM = 0x40000000,
+    SOUND_TYPE_MONSTER = 0x20000000,
+    SOUND_TYPE_ANOMALY = 0x10000000,
+    SOUND_TYPE_WORLD = 0x08000000,
+
+    SOUND_TYPE_PICKING_UP = 0x04000000,
+    SOUND_TYPE_DROPPING = 0x02000000,
+    SOUND_TYPE_HIDING = 0x01000000,
+    SOUND_TYPE_TAKING = 0x00800000,
+    SOUND_TYPE_USING = 0x00400000,
+
+    SOUND_TYPE_SHOOTING = 0x00200000,
+    SOUND_TYPE_EMPTY_CLICKING = 0x00100000,
+    SOUND_TYPE_BULLET_HIT = 0x00080000,
+    SOUND_TYPE_RECHARGING = 0x00040000,
+
+    SOUND_TYPE_DYING = 0x00020000,
+    SOUND_TYPE_INJURING = 0x00010000,
+    SOUND_TYPE_STEP = 0x00008000,
+    SOUND_TYPE_TALKING = 0x00004000,
+    SOUND_TYPE_ATTACKING = 0x00002000,
+    SOUND_TYPE_EATING = 0x00001000,
+
+    SOUND_TYPE_IDLE = 0x00000800,
+
+    SOUND_TYPE_OBJECT_BREAKING = 0x00000400,
+    SOUND_TYPE_OBJECT_COLLIDING = 0x00000200,
+    SOUND_TYPE_OBJECT_EXPLODING = 0x00000100,
+    SOUND_TYPE_AMBIENT = 0x00000080,
+#endif
 
     SOUND_TYPE_ITEM_PICKING_UP = SOUND_TYPE_ITEM | SOUND_TYPE_PICKING_UP,
     SOUND_TYPE_ITEM_DROPPING = SOUND_TYPE_ITEM | SOUND_TYPE_DROPPING,

src/xrSound/CMakeLists.txt

@@ -0,0 +1,27 @@
+project(xrSound)
+
+list(APPEND DIRS
+	"."
+	)
+
+add_dir("${DIRS}")
+
+include_directories(
+	${CMAKE_CURRENT_SOURCE_DIR}/.. 
+	${CMAKE_CURRENT_SOURCE_DIR}/../xrEngine 
+	${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/libvorbis/include 
+	${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/libogg/include 
+	${CMAKE_CURRENT_SOURCE_DIR}/../../Externals/openal/include
+	${CMAKE_CURRENT_SOURCE_DIR}/../../sdk/include
+	)
+
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/./MusicStream.cpp")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./xr_cda.h")
+list(REMOVE_ITEM ${PROJECT_NAME}__INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/./MusicStream.h")
+
+
+add_library(${PROJECT_NAME} SHARED ${${PROJECT_NAME}__SOURCES} ${${PROJECT_NAME}__INCLUDES})
+
+set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "")
+target_link_libraries(${PROJECT_NAME} xrCore ogg vorbis vorbisfile openal xrAPI xrCDB)

src/xrSound/MusicStream.cpp

@@ -6,7 +6,9 @@
 #include "MusicStream.h"
 #include "xr_streamsnd.h"
 
+#if defined(WINDOWS)
 #include "x_ray.h"
+#endif
 #include "GameFont.h"
 
 //////////////////////////////////////////////////////////////////////

src/xrSound/OpenALDeviceList.cpp

@@ -26,10 +26,12 @@
 #include "OpenALDeviceList.h"
 #include "xrCore/xr_token.h"
 
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <objbase.h>
 #pragma warning(pop)
+#endif
 
 #ifdef _EDITOR
 log_fn_ptr_type* pLog = nullptr;
@@ -38,7 +40,9 @@ log_fn_ptr_type* pLog = nullptr;
 void __cdecl al_log(char* msg) { Log(msg); }
 ALDeviceList::ALDeviceList()
 {
+#if defined(WINDOWS)
     pLog = al_log;
+#endif
     snd_device_id = (u32)-1;
     Enumerate();
 }
@@ -66,7 +70,9 @@ void ALDeviceList::Enumerate()
     // -- empty all the lists and reserve space for 10 devices
     m_devices.clear();
 
+#if defined(WINDOWS)
     CoUninitialize();
+#endif
     // grab function pointers for 1.0-API functions, and if successful proceed to enumerate all devices
     if (alcIsExtensionPresent(nullptr, "ALC_ENUMERATION_EXT"))
     {
@@ -86,11 +92,13 @@ void ALDeviceList::Enumerate()
         // Also we assume that if "Generic Hardware" exists, than "Generic Software" is also exists
         // Maybe wrong
 
+#if defined(WINDOWS) //Maybe in Linux this not?
         if (0 == xr_stricmp(m_defaultDeviceName, AL_GENERIC_HARDWARE))
         {
             xr_strcpy(m_defaultDeviceName, AL_GENERIC_SOFTWARE);
             Msg("SOUND: OpenAL: default SndDevice name set to %s", m_defaultDeviceName);
         }
+#endif
 
         index = 0;
         // go through device list (each device terminated with a single NULL, list terminated with double NULL)
@@ -169,8 +177,10 @@ void ALDeviceList::Enumerate()
             GetDeviceDesc(j).props.eax, GetDeviceDesc(j).props.efx ? "yes" : "no",
             GetDeviceDesc(j).props.xram ? "yes" : "no");
     }
+#if defined(WINDOWS)
     if (!strstr(GetCommandLine(), "-weather"))
         CoInitializeEx(nullptr, COINIT_MULTITHREADED);
+#endif
 }
 
 pcstr ALDeviceList::GetDeviceName(u32 index) const { return snd_devices_token[index].name; }

src/xrSound/SoundRender.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Sound.h"
+#include "sound.h"
 
 class CSoundRender_Core;
 class CSoundRender_Source;

src/xrSound/SoundRender_Core.cpp

@@ -5,10 +5,12 @@
 #include "SoundRender_Core.h"
 #include "SoundRender_Source.h"
 #include "SoundRender_Emitter.h"
+#if defined(WINDOWS)
 #pragma warning(push)
 #pragma warning(disable : 4995)
 #include <eax/eax.h>
 #pragma warning(pop)
+#endif
 
 int psSoundTargets = 32;
 Flags32 psSoundFlags = {ss_Hardware | ss_EAX};
@@ -473,7 +475,7 @@ void CSoundRender_Core::env_apply()
 }
 
 void CSoundRender_Core::update_listener(const Fvector& P, const Fvector& D, const Fvector& N, float dt) {}
-
+#if defined(WINDOWS)
 void CSoundRender_Core::i_eax_listener_set(CSound_environment* _E)
 {
     VERIFY(bEAX);
@@ -538,13 +540,16 @@ void CSoundRender_Core::i_eax_listener_get(CSound_environment* _E)
     E->EnvironmentDiffusion = (float)ep.flEnvironmentDiffusion;
     E->AirAbsorptionHF = (float)ep.flAirAbsorptionHF;
 }
+#endif
 
+#if defined(WINDOWS)
 void CSoundRender_Core::i_eax_commit_setting()
 {
     // commit eax
     if (bDeferredEAX)
         i_eax_set(&DSPROPSETID_EAX_ListenerProperties, DSPROPERTY_EAXLISTENER_COMMITDEFERREDSETTINGS, nullptr, 0);
 }
+#endif
 
 void CSoundRender_Core::object_relcase(IGameObject* obj)
 {
@@ -600,6 +605,7 @@ void CSoundRender_Core::set_environment_size(CSound_environment* src_env, CSound
     {
         CSoundRender_Environment* SE = static_cast<CSoundRender_Environment*>(src_env);
         CSoundRender_Environment* DE = static_cast<CSoundRender_Environment*>(*dst_env);
+#if defined(WINDOWS)
         // set environment
         i_eax_set(&DSPROPSETID_EAX_ListenerProperties,
             DSPROPERTY_EAXLISTENER_IMMEDIATE | DSPROPERTY_EAXLISTENER_ENVIRONMENTSIZE, &SE->EnvironmentSize,
@@ -610,16 +616,19 @@ void CSoundRender_Core::set_environment_size(CSound_environment* src_env, CSound
             DSPROPERTY_EAXLISTENER_IMMEDIATE | DSPROPERTY_EAXLISTENER_ENVIRONMENTSIZE, &DE->EnvironmentSize,
             sizeof(DE->EnvironmentSize));
         i_eax_listener_get(DE);
+#endif
     }
 }
 void CSoundRender_Core::set_environment(u32 id, CSound_environment** dst_env)
 {
     if (bEAX)
     {
         CSoundRender_Environment* DE = static_cast<CSoundRender_Environment*>(*dst_env);
+#if defined(WINDOWS)
         // set environment
         i_eax_set(&DSPROPSETID_EAX_ListenerProperties,
             DSPROPERTY_EAXLISTENER_IMMEDIATE | DSPROPERTY_EAXLISTENER_ENVIRONMENTSIZE, &id, sizeof(id));
         i_eax_listener_get(DE);
+#endif
     }
 }

src/xrSound/SoundRender_Core.h

@@ -71,8 +71,10 @@ class CSoundRender_Core : public ISoundManager
     u32 cache_bytes_per_line;
 
 protected:
+#if defined(WINDOWS)
     virtual void i_eax_set(const GUID* guid, u32 prop, void* val, u32 sz) = 0;
     virtual void i_eax_get(const GUID* guid, u32 prop, void* val, u32 sz) = 0;
+#endif
 
 public:
     CSoundRender_Core();
@@ -111,11 +113,12 @@ class CSoundRender_Core : public ISoundManager
     // listener
     //	virtual const Fvector&				listener_position		( )=0;
     virtual void update_listener(const Fvector& P, const Fvector& D, const Fvector& N, float dt) = 0;
+#if defined(WINDOWS)
     // eax listener
     void i_eax_commit_setting();
     void i_eax_listener_set(CSound_environment* E);
     void i_eax_listener_get(CSound_environment* E);
-
+#endif
     virtual SoundEnvironment_LIB* get_env_library() { return s_environment; }
     virtual void refresh_env_library();
     virtual void set_user_env(CSound_environment* E);

src/xrSound/SoundRender_CoreA.cpp

@@ -11,12 +11,14 @@ CSoundRender_CoreA::CSoundRender_CoreA() : CSoundRender_Core()
     pDevice = nullptr;
     pDeviceList = nullptr;
     pContext = nullptr;
+#if defined(WINDOWS)
     eaxSet = nullptr;
     eaxGet = nullptr;
+#endif
 }
 
 CSoundRender_CoreA::~CSoundRender_CoreA() {}
-
+#if defined(WINDOWS)
 bool CSoundRender_CoreA::EAXQuerySupport(bool isDeferred, const GUID* guid, u32 prop, void* val, u32 sz)
 {
     if (AL_NO_ERROR != eaxGet(guid, prop, 0, val, sz))
@@ -67,6 +69,7 @@ bool CSoundRender_CoreA::EAXTestSupport(bool isDeferred)
         return false;
     return true;
 }
+#endif
 
 void CSoundRender_CoreA::_restart() { inherited::_restart(); }
 void CSoundRender_CoreA::_initialize()
@@ -115,9 +118,9 @@ void CSoundRender_CoreA::_initialize()
     A_CHK(alListener3f(AL_POSITION, 0.f, 0.f, 0.f));
     A_CHK(alListener3f(AL_VELOCITY, 0.f, 0.f, 0.f));
     Fvector orient[2] = {{0.f, 0.f, 1.f}, {0.f, 1.f, 0.f}};
-    A_CHK(alListenerfv(AL_ORIENTATION, &orient[0].x));
+    A_CHK(alListenerfv(AL_ORIENTATION, (const ALfloat*)&orient[0].x));
     A_CHK(alListenerf(AL_GAIN, 1.f));
-
+#if defined(WINDOWS)
     // Check for EAX extension
     bEAX = deviceDesc.props.eax && !deviceDesc.props.eax_unwanted;
 
@@ -133,7 +136,7 @@ void CSoundRender_CoreA::_initialize()
         bDeferredEAX = EAXTestSupport(true);
         bEAX = EAXTestSupport(false);
     }
-
+#endif
     inherited::_initialize();
 
     // Pre-create targets
@@ -182,8 +185,10 @@ void CSoundRender_CoreA::_clear()
     xr_delete(pDeviceList);
 }
 
+#if defined(WINDOWS)
 void CSoundRender_CoreA::i_eax_set(const GUID* guid, u32 prop, void* val, u32 sz) { eaxSet(guid, prop, 0, val, sz); }
 void CSoundRender_CoreA::i_eax_get(const GUID* guid, u32 prop, void* val, u32 sz) { eaxGet(guid, prop, 0, val, sz); }
+#endif
 void CSoundRender_CoreA::update_listener(const Fvector& P, const Fvector& D, const Fvector& N, float dt)
 {
     inherited::update_listener(P, D, N, dt);
@@ -198,5 +203,5 @@ void CSoundRender_CoreA::update_listener(const Fvector& P, const Fvector& D, con
 
     A_CHK(alListener3f(AL_POSITION, Listener.position.x, Listener.position.y, -Listener.position.z));
     A_CHK(alListener3f(AL_VELOCITY, 0.f, 0.f, 0.f));
-    A_CHK(alListenerfv(AL_ORIENTATION, &Listener.orientation[0].x));
+    A_CHK(alListenerfv(AL_ORIENTATION, (const ALfloat*)&Listener.orientation[0].x));
 }