Commit Graph

113 Commits

Author SHA1 Message Date
Liru Færs
f3609b06d7 Further CI/CD & building sync with alchemy
Reorder Variables.cmake for mergeability
Renames CMake Variables:
FMODSTUDIO->USE_FMODSTUDIO, NVAPI->USE_NVAPI,
VIEWER_CHANNEL_BASE->VIEWER_CHANNEL_TYPE
VIEWER_BRANDING_ID->VIEWER_BINARY_NAME,
VIEWER_PRODUCT_NAME->VIEWER_CHANNEL_BASE

Remove unused variables:
VIEWER_PACKAGE_ID, VIEWER_EXE_STRING, VIEWER_SHORTCUT_STRING, VERSION_BUILD

PACKAGE now defaults to on, USE_FMODSTUDIO now defaults to off

Use list append instead of set in some more places

Adds support for Project channels.
2019-12-17 19:31:08 -05:00
Router Gray
e3d69b4d8e [Audio] Make Fmod cooperate with the new PCH shiny. Also fixes OpenAL in Windows. 2019-10-21 20:23:55 -05:00
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
Router Gray
58d94e9883 Change some instances of {0} to {} to pacify compilers. 2019-05-24 12:06:30 -05:00
Shyotl
989c40e59a llaudio merge 2016-04-04 00:38:57 -05:00
Lirusaito
48e6e4eb98 Sync up llaudio/llaudioengine_fmodstudio.cpp: Compile now, please? 2016-03-28 07:50:48 -04:00
Lirusaito
79965fade1 Alchemerge
Applies the following alchemy patches:
28fe46209ea5: Don't spam setPaused in fmod studio audio stream code
eb12ff41434a: Fix single click to walk triggering on huds
31955a7826b9: Fix double click to walk being triggered by huds and touchable objects
Fix double click to walk triggering while sitting and flying
Fix double click to walk behavior being inconsistent with single click to walk
Fix double click teleport being affected by transparent objects
Properly fixes MAINT-957

Compile stuff updates:
Adds VCRedist to package, should fix failure to launch reported by Nomade Zhao.
Updates package_description to better suit Singularity
Turns secondlife-bin in places to singularity-bin

Updates the following libraries:
Curl (7.47.0), gperftools (0.0.2), openssl (1.0.2f), SLVoice on Linux64,
2016-02-25 21:13:13 -05:00
Drake Arconis
1d2995666f Remove FMOD Ex 2016-01-16 13:07:51 -05:00
Drake Arconis
e8ec5d750c Hacks to get fmod working for now 2016-01-16 12:49:35 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Shyotl
ada7e3ca30 Make clang happier. 2015-06-25 20:19:55 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Shyotl
c708408f64 Linux OSS was removed from fmodstudio. Also fix issue in linux manifest. 2015-01-10 16:11:52 -06:00
Shyotl
7943adedaa Also need this. Last build only succeeded due to lingering obsolete entries in the cmake var cache. 2015-01-05 14:25:55 -06:00
Shyotl
e2cd11ccd7 Fix up some small typos and avoid c++11's string::back()/pop_back() calls for now. 2014-12-08 21:40:11 -06:00
Shyotl
f5204cc8f5 Check for bad FMOD_RESULT return values for practically every fmod api call. Wavedata dsp also now attached before fmod's fader DSP, and although that makes the stream channelgroup less than necessary, channelgroups are still nice to have. 2014-11-26 01:15:17 -06:00
Shyotl
87f87bf2ff Delegate stream shutdown to LLAudioEngine and LLStreamingAudio_* 2014-11-25 16:37:39 -06:00
Shyotl
b3d86e626b Fixed wind dsp and implemented a DSP that mimics removed FMOD::Channel::getWaveData func.
Fixed crash if fmod profiling was enabled.
Fixed crash due to failing to check if resulting utf string from stream metadata was zero-length before calling std::string::back.
2014-11-25 16:32:04 -06:00
Shyotl
c2abbaedc8 Merge branch 'master' of https://Shyotl@bitbucket.org/LightDrake/singularityviewer-internal.git into FMODStudio 2014-11-22 22:20:32 -06:00
Shyotl
6e537cd322 Try to handle BOM for utf stream metadata (doesn't seem common, at all). 2014-11-22 22:01:45 -06:00
Drake Arconis
2d0905a4a6 Fix for fmod studio 1.5 2014-09-10 01:11:14 -04:00
Drake Arconis
2a64c07215 Fix fmodex breakage 2014-08-21 22:00:59 -04:00
Drake Arconis
90d2dce07a Add FMOD Studio support 2014-08-10 17:41:10 -04:00
Inusaito Sayori
5affacab70 Fixes, mainly for Clang/Mac, from Cinder. 2014-03-24 16:56:10 -04:00
Aleric Inglewood
ed0628774a Turn noisy AudioEngine debug output into Debug Level. 2013-12-04 01:21:18 +01:00
Shyotl
503e5287cd Fix minor oversight that broke openal audio impl. 2013-11-18 23:27:29 -06:00
Shyotl
b9d2ad3132 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2013-11-18 10:38:39 -06:00
Shyotl
2badc1c79c Initialize LLListener_OpenAL::mRolloffFactor just to be safe. 2013-11-18 09:55:15 -06:00
Latif Khalifa
bcfe5232fb Merge branch 'windows64' of github.com:lkalif/SingularityViewer 2013-10-24 01:37:45 +02:00
Shyotl
8e94c43a54 Fix a tp crash, and rework sound preloading slightly. 2013-10-23 17:23:20 -05:00
Latif Khalifa
93e62a375c WIP[win64]: Rebuilt jpeglib, libpng, fixed loading of fmodex 2013-10-20 20:17:03 +02:00
Shyotl
addd687bf8 What is this? Where am I? Oh god. (Fix mistake in openal audioimpl) 2013-10-18 02:27:09 -05:00
Shyotl
03c4535648 Made further refinements to the audioengine:
-Looping syncslaves are stopped when there is no syncmaster.
-Hardened against edge cases regarding soundsource priority sorting.
-Fixed issue with syncmasters being marked as having looped when instead they just started playing (caused double-start of syncslaves).
-Updated some comments.
2013-10-16 21:32:08 -05:00
Shyotl
6155e64086 Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 2013-10-13 19:27:03 -05:00
Shyotl
dbfd0cb7a6 Fixed a shutdown crash in LLAudioEngine::assetCallback, and fixed behavior when soundsource re-issues a sound whilst a sound is currently playing for same source. (LLAudioChannel[Impl]::play now re-starts sound if already playing) 2013-10-13 16:22:24 -05:00
Latif Khalifa
aa077032b7 Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2013-10-12 22:45:05 +02:00
Aleric Inglewood
1389bf76ce Bug fix. 2013-10-12 22:36:27 +02:00
Shyotl
daa07d031c Fixed a couple of compilation errors when using GCC. 2013-10-12 12:13:58 -05:00
Shyotl
7fb05e6a48 Audio engine changes:
-Idle tick is now responsible for dispatching all pending sound sources, as such improves priority sorting.
-Added ui sound precache mechanisms (to fetch sounds without associated soundsources)
-Audio engine no logner available pre-login or upon disconnect, for simplicity.
-General cleanup to the audio engine/impl.
-Fixed some gAudiop calls that were lacking prerequisite null checks.
-Added 'isUpstreamOK' procuedure to LLAssetStorage to allow avoidance of making requests when there is no upstream host connection.
2013-10-12 02:49:11 -05:00
Shyotl
72c186f0f4 Fixed some unused variable warnings/errors when not compiling with assertions enabled. (eg 'release' configuration). Also snagged a nullcheck from upstream. 2013-06-06 02:12:45 -05:00
Shyotl
909fc0d9ce Blah blah fix non-windows builds. 2013-06-04 17:08:59 -05:00
Shyotl
3a7955192e Temporary super-obsessive audioengine debugging/diagnostics. 2013-06-04 04:39:51 -05:00
Shyotl
821fd1f7d6 Handle fmodex internal channel release by registering channel callbacks. Harden channel<->source associations. Assign console output for audio system "AudioEngine" and "AudioImpl" tags. Added base LLAudioChannel::cleanup() vfunc to handle non-impl-related variable cleanup. Killed some redundant code. 2013-06-04 03:46:26 -05:00
Shyotl
2b30a5a4e7 Catch case in llaudioengine where audio buffers are released with channels still consuming them(A proper fix should be done to avoid this scenario in the future).
Added stricter checking for fmodex errors.
Demote a harmless message from llinfos to lldebugs when audio buffers are all consumed.
Initialize LLAudioBuffer member variables.
-LLAudioBuffer::mInUse is inited to TRUE to avoid buffers that just got created from getting deleted during the same frame by new audio sources further down the chain.
2013-05-16 01:58:35 -05:00
Shyotl
e8ce35ebf8 Merge branch 'master' into UICleanup
Conflicts:
	indra/llcommon/llstl.h
	indra/newview/jcfloaterareasearch.cpp
	indra/newview/jcfloaterareasearch.h
	indra/newview/llfloateranimpreview.cpp
	indra/newview/llfloateranimpreview.h
	indra/newview/llfloaterperms.cpp
	indra/newview/llfloaterproperties.cpp
	indra/newview/llpanelpermissions.cpp
	indra/newview/llviewermenu.cpp
2013-05-03 21:41:51 -05:00
Shyotl
808341e184 Testing: Be a bit more OCD about avoiding starting new streams before the previous one has been successfully been released. 2013-05-03 14:32:18 -05:00
Melanie
72db1a02b7 Fix audio the proper way 2013-04-23 03:16:31 +02:00
Melanie
ba6b2ef865 Revert "Add the new audio init code (experimental)"
This reverts commit 1bc887f887.
2013-04-23 03:15:59 +02:00
Melanie
1bc887f887 Add the new audio init code (experimental) 2013-04-21 05:55:47 +02:00
Siana Gearz
24047c933a No longer stall to death on unreadable streams 2013-04-20 13:27:32 +02:00