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
Drake Arconis
20cdb35172
Import some changes from internal
2013-03-12 06:03:06 -04:00
Drake Arconis
0e3a9b28bd
CMake cleanup and organization
2013-03-05 12:24:51 -05:00
Siana Gearz
c9ab38d449
Stream frequency change support and new anti-starvation strategy
2013-02-26 23:13:39 +01:00
Shyotl
dbf646f266
More verbose fmodex llinfos output upon init. (will be useful when I add more output options.. if we keep fmodex)
2013-02-19 01:52:29 -06:00
Shyotl
d71210e942
Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory)
2013-01-07 14:44:54 -06:00
Aleric Inglewood
15cce79040
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/llmessage/llcurl.cpp
Changes to unused file (I'll remove it when I'm done).
2012-09-04 17:38:11 +02:00
Siana Gearz
b4a7fa1ad9
Force Vorbis to link before FMODEx
2012-09-01 03:10:26 +02:00
Siana Gearz
aceb3f3425
Fix playback of streams with über-long header, thx to Brett@FMOD
2012-08-20 16:09:55 +02:00
Aleric Inglewood
fbb5dced97
Merge remote-tracking branch 'singu/master' into curlthreading2
...
Conflicts:
indra/llcommon/CMakeLists.txt
indra/llmessage/llcurl.cpp
indra/llmessage/llcurl.h
indra/llmessage/llhttpclient.cpp
indra/llmessage/llhttpclient.h
indra/llmessage/llpumpio.cpp
indra/llmessage/llpumpio.h
indra/llmessage/llurlrequest.cpp
indra/llmessage/llurlrequest.h
indra/newview/hipporestrequest.cpp
indra/newview/llappviewer.cpp
indra/newview/llspatialpartition.cpp
indra/newview/llviewermedia.cpp
indra/newview/llxmlrpctransaction.cpp
Conflicts resolved by choosing curlthreading2
for any llmessage file regardless (which looks
correct upon investigation); the rest also
turned out to need to use curlthreading2, except
in one line where I added a semi-colon after
an assert(), and the assert was changed in
singu/master.
2012-08-13 17:07:25 +02:00
Aleric Inglewood
cd197a3807
Fix LL_REF_COUNT_DEBUG debug code.
...
This code was broken with respect to LLAPRPool.
Fix that, and also fixed it for the new AIThreadID API.
2012-08-09 07:00:51 +02:00
Siana Gearz
e616b40c6f
Autodetect music stream type properly
2012-08-09 05:09:02 +02:00
Siana Gearz
de74443d76
Merge branch 'master' of https://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/newview/llvovolume.cpp
indra/newview/skins/default/xui/fr/panel_overlaybar.xml
2012-08-09 00:42:23 +02:00
Shyotl
081ae32d35
Disable diagnostic fmodex stream allocation overrides. (will break on ogg streams. badly.)
2012-07-25 23:08:37 -05:00
Siana Gearz
9c1e74b0c0
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llstreamingaudio_fmodex.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
2012-07-23 03:04:33 +02:00
Shyotl
4e4d554ea4
Silence the diagnostic llinfos spam when listening to a stream.
2012-07-20 12:11:30 -05:00
Drake Arconis
1e81966b89
Clean up and updates
...
Cleaned up header bloatyness in linden_common
Moved around things to be in line with Linden Lab
Updated llinitparam and imported its new dependencies
Removed dohexeditor and related files
Removed unused legacy files
/\_..._/\
|/ \_/ \|
| o.-.o |
\ ( O ) /
/'--U--'\
| .:. | /\
| /:;:\ |` /
Drake | |:;:| |-'
Arconis / |'-'| \
`""` `""`
2012-07-20 08:13:07 -04:00
Shyotl
85da7163a7
Changing the rolloff settings now immediately apply (with fmodex). Also added AudioLevelUnderwaterRolloff now that the underwater rolloff 3d setting doesnt immediately get clobbered. Also, divvied up sound channels into channelgroups if using the fmod profiler, so it actually has useful info to show now.
2012-07-20 04:00:02 -05:00
Siana Gearz
a8a30ae3b9
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
2012-07-19 22:19:52 +02:00
Shyotl
756a284048
Don't ever halt stalled fmodex streams, as they don't seem to truly 'stall'. Decrease delay between leaving starvation and unmuting down to 1 second (from 5).
2012-07-19 02:32:16 -05:00
Siana Gearz
a4d2cb3d12
Some fighting with Shyotl over FMOD Ex
2012-07-19 05:35:17 +02:00
Siana Gearz
8ad40c5d66
Merge branch 'master' of git://github.com/Shyotl/SingularityViewer
...
Conflicts:
indra/llaudio/llaudioengine_fmodex.cpp
2012-07-19 04:44:01 +02:00
Shyotl
643844c01d
GCC being GCC-ey. Fix a couple errors and warnings
2012-07-18 21:27:46 -05:00
Shyotl
5fcdbfdd9e
FMODEx diagnostics.
...
SHFMODExStreamBufferSize added. Determines stream buffer size in ms. (stream restart required)
SHFMODExDecodeBufferSize added. Determines decode buffer size in ms. (stream restart required)
Streams will mute themselves if they are starving, until they are free of starvation for 5 full seconds.
Streams that fail to accumulate any buffer progress while starving for 10 full updates will be stopped.
Stream buffer progress(buffer percent) is llinfos spewed every update. (temporary)
Doubled default stream buffer size
Increased default decode buffer size to 1000ms (from 400)
Temporarily using FMOD::Memory_Initialize to display raw stream/decode buffer sizes via llinfos.
Added llwarns messages for SigmaTel hardware or bad audio acceleration configuration.
2012-07-18 21:05:24 -05:00
Siana Gearz
96fa4af939
Initialize FMOD Ex with 44100 Hz, like FMOD
2012-07-19 03:26:02 +02:00
Siana Gearz
fe65e19b67
Fix wind on multichannel systems
2012-07-10 15:08:20 +02:00
Drake Arconis
7af331c50d
First set of changes for new librarys and lib layout support!
...
Modified repackage script to support new layout
Fixed webkit to work against new llqtwebkit
2012-07-04 00:26:42 +00:00
Aleric Inglewood
058720824d
Fixup of LLAtomic and LLThreadSafeRefCount
2012-06-27 04:27:07 +02:00
Lirusaito
73c05eff77
Cherry-pick of 24a7281bef42 from viewer-development, also added missing AttachmentDrop to notifications.xml
...
simon@Simon-PC.lindenlab.com: MAINT-862 and ER-1781 : Sounds not playing the first time. Reviewed by Kelly.
2012-06-02 05:13:50 -04:00
Lirusaito
20f138b31f
Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear
2012-05-30 21:16:27 -04:00
Shyotl
063ce180d3
Fmodex stereo fallback wasn't done quite right.
2012-05-30 18:56:36 -05:00
Drake Arconis
5a2d160ac4
Fixed FMOD Ex support under linux
2012-05-15 10:36:48 -04:00
Siana Gearz
83a3bbb48e
Fixies from viewer-development
2012-03-06 09:01:01 +01:00
Siana Gearz
fe579d6e4b
Activity/spam radar enhancement, from Avination
2012-02-15 14:07:03 +01:00
Shyotl
9973dfd1c7
Tweaked stream buffer size used in fmodex.
2012-01-30 03:44:20 -06:00
Shyotl
f5818b7621
Pass FMOD_IGNORETAGS flag when creating FMOD Ex streams. Without the flag it is more prone to failing to successfully detect stream format info under certain circumstances.
2012-01-29 01:20:26 -06:00
Lirusaito
61beedd3d9
Changed style of comments with asterisks to avoid highlighting errors on //* with weak highlighters, change is to all files that could potentially break highlights
...
Most were needed, though some were just for possible problems with highlighting, should not affect performance whatsoever.
2012-01-09 05:40:03 -05:00
Siana Gearz
a6f36abab0
Semicolon care and feeding
2012-01-07 23:44:46 +01:00
Shyotl
af7affa9dd
Removed code for a case that will never occur (for oscillator). Also tiny bugfix related to iterating down wavedata buffers.
2012-01-03 21:31:21 -06:00
Shyotl
a3f7399d7d
Added media ticker to Singularity menu. Will be greyed out for anything not FMOD based. Consider implementing in other sound libraries as a to-do. FMOD Ex also displays an oscillator (making fmod3 do this is too dirty, so that's not going to be backported).
2012-01-03 20:27:56 -06:00
