From 7f091b864e5ec8c574971cc4a839d95c52c26b58 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Wed, 12 Jul 2023 16:47:32 +0800 Subject: Include standard library array header as it's not implied on some platforms that std::array would be unrecognised. --- indra/llaudio/llaudioengine.h | 1 + 1 file changed, 1 insertion(+) (limited to 'indra/llaudio') diff --git a/indra/llaudio/llaudioengine.h b/indra/llaudio/llaudioengine.h index 0fe8b3d756..cf694cfaf4 100755 --- a/indra/llaudio/llaudioengine.h +++ b/indra/llaudio/llaudioengine.h @@ -30,6 +30,7 @@ #include #include +#include #include "v3math.h" #include "v3dmath.h" -- cgit v1.2.3 From d02fa6d02e25cdf955dabd2ff3c63925ba15afa5 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Tue, 1 Aug 2023 09:14:47 +0800 Subject: llaudio can be installed to the system too --- indra/llaudio/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) (limited to 'indra/llaudio') diff --git a/indra/llaudio/CMakeLists.txt b/indra/llaudio/CMakeLists.txt index 4f469b9bb5..f36da83c69 100644 --- a/indra/llaudio/CMakeLists.txt +++ b/indra/llaudio/CMakeLists.txt @@ -69,3 +69,5 @@ endif() if( TARGET ll::fmodstudio ) target_link_libraries( llaudio ll::fmodstudio ) endif() + +include(LibraryInstall) -- cgit v1.2.3 From b6574337ed3fd7749db6185501cd444305d44905 Mon Sep 17 00:00:00 2001 From: Erik Kundiman Date: Thu, 24 Aug 2023 08:23:25 +0800 Subject: OpenAL createDefaultStreamingAudioImpl stub In llstartup, it says if the audio engine hasn't set up its own preferred handler for streaming audio, then the generic streaming audio implementation which uses media plugins will be used. The comparison is with NULL, so it's safe to return NULL (but probably not nullptr). --- indra/llaudio/llaudioengine_openal.cpp | 5 +++++ indra/llaudio/llaudioengine_openal.h | 1 + 2 files changed, 6 insertions(+) (limited to 'indra/llaudio') diff --git a/indra/llaudio/llaudioengine_openal.cpp b/indra/llaudio/llaudioengine_openal.cpp index 0a79614424..bd262f253b 100644 --- a/indra/llaudio/llaudioengine_openal.cpp +++ b/indra/llaudio/llaudioengine_openal.cpp @@ -119,6 +119,11 @@ std::string LLAudioEngine_OpenAL::getDriverName(bool verbose) return version.str(); } +LLStreamingAudioInterface *LLAudioEngine_OpenAL::createDefaultStreamingAudioImpl() const +{ + return NULL; +} + // virtual void LLAudioEngine_OpenAL::allocateListener() { diff --git a/indra/llaudio/llaudioengine_openal.h b/indra/llaudio/llaudioengine_openal.h index a3cab97cd2..49ff484809 100644 --- a/indra/llaudio/llaudioengine_openal.h +++ b/indra/llaudio/llaudioengine_openal.h @@ -42,6 +42,7 @@ class LLAudioEngine_OpenAL : public LLAudioEngine virtual bool init(void *user_data, const std::string &app_title); virtual std::string getDriverName(bool verbose); + virtual LLStreamingAudioInterface* createDefaultStreamingAudioImpl() const; virtual void allocateListener(); virtual void shutdown(); -- cgit v1.2.3