Commit Graph

12 Commits (6173233fb01e5baff7b089b27c74924b94cc7c03)

Author SHA1 Message Date
Ansariel 5f1a19af72 Merge remote-tracking branch 'LL/marchcat/x-ws-merge'
# Conflicts:
#	autobuild.xml
#	indra/linux_crash_logger/llcrashloggerlinux.cpp
#	indra/newview/llappviewerlinux_api.h
#	indra/newview/llappviewerlinux_api_dbus.cpp
#	indra/newview/llappviewerlinux_api_dbus.h
#	indra/newview/llavatarpropertiesprocessor.h
#	indra/newview/llcallbacklist.cpp
#	indra/newview/llimpanel.h
2024-05-01 12:30:57 +02:00
Andrey Lihatskiy 1b68f71348 #824 Process source files in bulk: replace tabs with spaces, convert CRLF to LF, and trim trailing whitespaces as needed 2024-04-29 07:56:09 +03:00
Ansariel 9b93864eb9 Merge branch 'DRTVWR-582-maint-U' of https://github.com/secondlife/viewer
# Conflicts:
#	autobuild.xml
#	indra/cmake/CMakeLists.txt
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llcommon/llsdserialize.cpp
#	indra/llcommon/llsdserialize.h
#	indra/llcommon/tests/llleap_test.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llfilepicker_mac.mm
#	indra/newview/llinventorymodel.cpp
#	indra/newview/llstartup.cpp
#	indra/newview/llurldispatcher.cpp
#	indra/newview/llvieweraudio.cpp
#	indra/newview/skins/default/xui/en/menu_viewer.xml
#	indra/newview/skins/default/xui/en/strings.xml
2023-04-21 14:22:42 +02:00
Alexander Gavriliuk ba8bcf6520 SL-19042: Replace FMOD with VLC for parcel audio 2023-04-04 19:44:07 +02:00
Ansariel 7185e97905 Merge branch 'DRTVWR-548-maint-N' of https://bitbucket.org/lindenlab/viewer
# Conflicts:
#	indra/llaudio/llaudiodecodemgr.cpp
#	indra/llaudio/llaudioengine.cpp
#	indra/llaudio/llaudioengine.h
#	indra/llaudio/llaudioengine_fmodstudio.cpp
#	indra/llrender/llrender.cpp
#	indra/llwindow/llwindowwin32.cpp
#	indra/newview/app_settings/settings.xml
#	indra/newview/llviewerwindow.cpp
#	indra/newview/pipeline.cpp
2022-06-15 10:38:52 +02:00
Cosmic Linden 3e60b53d52 SL-16182: Offload audio decoding from the main thread to the general work queue.
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-06-14 11:31:52 -07:00
Ansariel 4268cc8c21 Final FMOD Studio upstream sync before merge 2020-04-10 18:15:42 +02:00
Andrey Kleshchev 2542a3ed79 SL-11445 Provide 'name' for Pulse Audio 2020-04-10 17:00:22 +03:00
Ansariel 041d5a5c0b Sync FMOD Studio implementation with upstream so we can keep our version when merging with upstream 2020-04-09 00:43:56 +02:00
Andrey Kleshchev 192aee0f19 Merged in SL-11445 Upgrade Fmodex to Fmod Studio 2020-01-31 15:05:51 +00:00
Ansariel 36a2de2353 Special request by Keli: Add output device selection for inworld sounds (only available with FMOD Studio!)
Selecting "Default" will always select the first output device; if the available
devices change and the previous default device isn't available anymore, the
viewer automatically switches to the new default device (depends on the OS which
gets the new default one!). Selecting a particular device will NOT automatically
switch to another device if it isn't available anymore (preferences will show
"Unavailable device"), but will switch back to this device once it becomes
available again.

Yank this change before Firestorm releases it and I will gladly yank your unreleased stuff!
2019-05-31 20:12:17 +02:00
Ansariel 5e1c9a92a8 Add support for FMOD Studio, originally by Drake Arconis (Alchemy Viewer), with FS-specific additions by Drakeo 2017-12-16 19:34:03 +01:00