summaryrefslogtreecommitdiff
path: root/indra/llaudio
AgeCommit message (Collapse)Author
2023-04-11Merge branch 'contribute' into DRTVWR-582-maint-UAndrey Lihatskiy
# Conflicts: # indra/llaudio/llaudioengine.cpp
2023-04-07Merge branch 'main' into marchcat/main-contrib-mergeAndrey Lihatskiy
# Conflicts: # indra/cmake/CMakeLists.txt # indra/llcommon/llsdserialize.cpp # indra/llcommon/llsdserialize.h # indra/llcommon/tests/llleap_test.cpp # indra/newview/llfilepicker.h # indra/newview/llfilepicker_mac.h # indra/newview/llfilepicker_mac.mm # indra/newview/skins/default/xui/en/strings.xml
2023-04-04SL-19042: Replace FMOD with VLC for parcel audioAlexander Gavriliuk
2023-01-10SL-18893 Fixes for pull requests #38, #41, and #42 (#46)Fawrsk
Eliminate unnecessary copies, and remove uses of auto
2023-01-05SL-18893 Clean up for loops in llaudio to use C++11 range based for loops (#41)Fawrsk
2022-10-24Merge master into DRTVWR-568 (and fix conflicts)Callum Linden
2022-09-17SL-17238 Fix coding policy build issuesAndrey Kleshchev
2022-09-16Merge remote-tracking branch 'origin/DRTVWR-543-maint_cmake' into ↵Nicky Dasmijn
DRTVWR-568_cmake
2022-09-15Merge branch 'master' into DRTVWR-548-maint-NAndrey Lihatskiy
# Conflicts: # indra/newview/llmodelpreview.h
2022-07-22SL-17816 Crash trying to schedule audio decoding on shutdownAndrey Kleshchev
2022-06-22SL-17021: Fix inconsistent header definition for LLAudioEngine_OpenALCosmic Linden
2022-06-14SL-16182: Fix Mac compiler errorsCosmic Linden
2022-06-14SL-16182: LLAudioDecodeMgr: Get general worker thread count directly from ↵Cosmic Linden
ThreadPool
2022-06-14SL-16182: Offload audio decoding from the main thread to the general work queue.Cosmic Linden
The work queue callback binds "this". This is deemed safe due to current dependencies, but see the associated comment in the return callback. There was some trial and error to get a this-binded lambda to compile. Due to LLVorbisDecodeState writing to disk off-thread, limit audio decodes proportional to general worker thread count. Guess the thread count for now.
2022-05-20SL-17425 Crash when closing two dependent floatersAndrey Kleshchev
dependent_it in llfloater was not valid after dependent floater removed itself from the list
2022-05-01Remove setting of HEADER_FILE_ONLY on .h* files, cmake automaticallyNicky
sets the property on those.
2022-04-18Merge remote-tracking branch 'origin/DRTVWR-543-maint' into ↵Nicky
DRTVWR-543-maint_cmake
2022-04-18Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/newview/app_settings/settings.xml # indra/newview/llfloatersearch.cpp # indra/newview/llgroupactions.cpp # indra/newview/llvovolume.cpp
2022-04-17Switch to target_include_directoriesNicky
All 3Ps include dirs are treated as SYSTEM, this will stop compilers stop emitting warnings from those files and greatly helps having high warning levels and not being swamped by warnings that come from external libraries.
2022-04-16Streamline fmodstudio/openal targets:Nicky
- Targets now define the appropriate c++ defines, no more hand magic needed for llstartup.cpp - Switch cmakeflage to USE_xxx rather than xxx as it was before. I personally find the USE_X notion more intuitive and it follows how KDU is used. - To be backward compatible OPENAL/FMODSTUDIO flag will be mapped to USE_OPENAL/USE_FMODSTUDIO
2022-04-13Rework cmake, the original plan was to maybe be able to use conan targets ↵Nicky
with the same name (that's why 3ps had names like apr::apr), but it's safer and saner to put the LL 3ps under the ll:: prefix. This also allows means it is possible to get rid of that bad "if( TRAGET ...) return() endif()" pattern and rather use include_guard().
2022-04-06Move CMake files to modernized cmake syntax, step 1.Nicky
Change projects to cmake targetsto get rid of havig to hardcore include directories and link libraries in consumer projects.
2022-04-04SL-16902 Fmod better loggingAndrey Kleshchev
2022-03-21SL-16865 llStopSound() does not stop sound if it is out of cutoff radiusAndrey Kleshchev
2022-03-14Revert "Debug Fmod with logging"Andrey Kleshchev
This reverts commits b21c17eee973dc06c1392dd45dbc19c1ce394852 and 2f78338aeb3d0297813bc9c9c7a9d75a2055000d. 'Debug Fmod' was not an intended commit, was meant for local testing. But might be a good idea to make this a part of DebWithRelInfo or provide a cmake switch.
2022-02-28Merge branch 'master' into DRTVWR-544-maintAndrey Lihatskiy
# Conflicts: # indra/llaudio/llstreamingaudio_fmodstudio.cpp # indra/newview/llviewerregion.cpp
2022-02-23Debug Fmod with loggingAndrey Kleshchev
2021-12-20Merge branch 'master' into DRTVWR-544-maintMnikolenko Productengine
2021-12-15Merge branch 'master' (DRTVWR-552) into DRTVWR-527-maintAndrey Kleshchev
# Conflicts: # indra/media_plugins/cef/media_plugin_cef.cpp - setOnLoadEndCallback # indra/newview/llviewerassetstorage.cpp - mAssetCoroCount
2021-11-27SL-16339 Rename setAmbient in openalAndrey Kleshchev
2021-11-26SL-16339 Rename setAmbient to not cause confusionAndrey Kleshchev
setAmbient has nothing to do with ambient sounds
2021-11-18SL-14992 fmod shutdown crashAndrey Kleshchev
2021-11-18SL-16235 Restart music in case of an errorAndrey Kleshchev
Additional logging
2021-03-25SL-14992 Replaced LLAPRFile's isExist with LLDirUtil's fileExists in fmodstudioAndrey Kleshchev
This particular case of LLAPRFile crashes due to thread issues (and if it doesn't it might be affecting some other apr call due to using default pool). Function is not opening the .dsf file in question and LLAPRFile won't ensure that file exists till the end of the function, it just checks that file exists at a given moment. No point to overcomplicate things by adding thread safe pool, so replaced with dirutil.
2021-03-09This set of changes reverts the merge with master (git revert c83e740) and ↵Callum Prentice
results in a version of the DRTVWR-519 that matches what was presemt before it was deployed as a release viewer *plus* 3 small fixes from Maxim (See commits). This branch can now be used for additional fixes before eventually being used to release D-519 as normal
2021-03-08Revert "Merge branch 'master' of https://bitbucket.org/lindenlab/viewer into ↵Brad Payne (Vir Linden)
DRTVWR-519" This reverts commit e61f485a04dc8c8ac6bcf6a24848359092884d14, reversing changes made to 00c47d079f7e958e473ed4083a7f7691fa02dcd5.
2020-09-24Complete the change from lldiskcache -> llfilesystem and then addition of ↵Callum Prentice
new lldiskcache implementation
2020-09-22Merge branch 'master' into DRTVWR-519Callum Prentice
2020-09-17The folder where the disk cache lives was originally renamed from llvfs to ↵Callum Prentice
llcache but @henri's suggestion that that doesn't reflect the other files in the same place and it should be llfilesystem is a good one so I changed it over
2020-09-16Renamed the references to LLVFile and llvfile.* source code plus cmake ↵Callum Prentice
scripts to use a different name - lldiskcache - since that more closely resembles what it is (or will be) now that the VFA is no more
2020-09-16First part of change to remove LLVFS from the Viewer. Consists of code ↵Callum Prentice
changes to remove LLVFS and LLVFSThread classes along with the associated source files. The existing llvfs folder is renamed to llcache. Also includes changes to CMake script in many places to reflect changes. Eventually, llvfile source file and class will be renamed but that is not in this change.
2020-06-05SL-13390 Fix Openal BuildsAndrey Kleshchev
2020-06-02Merge branch 'master' into DRTVWR-503-maintAndrey Lihatskiy
# Conflicts: # indra/newview/CMakeLists.txt # indra/newview/viewer_manifest.py
2020-05-04Merged master into DRTVWR-508Andrey Kleshchev
2020-04-14SL-12607 WIP, take pre-sized icons from repo instead of packageAndrey Kleshchev
2020-04-10SL-11445 Provide 'name' for Pulse AudioAndrey Kleshchev
2020-04-09SL-11445 On exit LLWindGen can be invalidAndrey Kleshchev
2020-04-09SL-11445 Fix fmod studio position and orientation attributesAndrey Kleshchev
2020-04-09SL-11445 Fix fmod studio opening audio filesAndrey Kleshchev
2020-03-19SL-11445 Fix crash caused by wind cleanupAndrey Kleshchev