Commit graph

314 commits

Author SHA1 Message Date
Stephen Birarda
842886d0fc add back read_pending_datagrams stats 2015-04-29 16:28:47 -07:00
Stephen Birarda
68998f4423 cleanup AudioMixer stats to be properly nested 2015-04-28 18:19:16 -07:00
Stephen Birarda
77be0012cf cleanup stats packaging in AudioMixer 2015-04-28 15:35:51 -07:00
Atlante45
604a13f8ad Only editor can mute environment 2015-04-15 17:04:59 +02:00
ZappoMan
e87e0a1e0b some cleanup of dead code related to timers 2015-03-11 16:27:04 -07:00
Atlante45
e79e1a547f Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
Conflicts:
	libraries/audio-client/src/AudioClient.cpp
	libraries/audio-client/src/AudioClient.h
2015-02-10 16:08:34 +01:00
Atlante45
1cfd98b2d7 Name threads 2015-01-31 00:50:12 -08:00
Atlante45
bd9668b9fa Change WetLevel modulation 2015-01-15 18:23:43 -08:00
Atlante45
46db3277eb Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing 2015-01-14 17:41:14 -08:00
Atlante45
692d9d060e Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
Conflicts:
	interface/src/Audio.cpp
	interface/src/Audio.h
	interface/src/ModelUploader.cpp
2015-01-14 17:14:18 -08:00
Atlante45
2a82ff9768 Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet_cpp11
Conflicts:
	assignment-client/src/voxels/VoxelServer.cpp
	interface/src/Application.cpp
	interface/src/Audio.cpp
	interface/src/DatagramProcessor.cpp
	interface/src/Menu.cpp
	interface/src/Util.cpp
	interface/src/avatar/MyAvatar.cpp
	interface/src/ui/ApplicationOverlay.cpp
	interface/src/ui/PreferencesDialog.cpp
	libraries/networking/src/NodeList.cpp
	libraries/shared/src/DependencyManager.h
2015-01-13 11:03:14 -08:00
David Rowe
07b30da2ac Fix miscellaneous types and casts 2015-01-08 13:44:51 -08:00
Stephen Birarda
c7a5f3c86c resolve conflicts and merge with upstream master 2014-12-29 10:59:42 -07:00
Clement
6f52cf6ee9 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_smoothing
Conflicts:
	interface/src/Audio.cpp
2014-12-29 09:48:38 -08:00
Atlante45
0bd9ed469e Changed NodeList::getInstance() calls to use the DM 2014-12-17 15:28:25 -08:00
Stephen Birarda
1db12453d4 move audio stats into member of Audio 2014-12-16 14:47:24 -08:00
Stephen Birarda
bb77986f1a use new AudioConstants in AudioMixer classes 2014-12-16 11:56:56 -08:00
Atlante45
1f35e130ef Smooth reverb wet level on room edges 2014-12-11 12:33:40 -08:00
Stephen Birarda
5c3e90f64f resolve conflicts on merge with upstream master 2014-12-03 13:11:56 -08:00
Atlante45
ae3bcc8f06 No more .f 2014-11-19 16:53:39 -08:00
Atlante45
0528a9ff9b Remove forgotten setLastMuted 2014-11-17 10:49:35 -08:00
Atlante45
4615afe034 Remove lastMuted member in AvatarAudioStream 2014-11-17 10:32:28 -08:00
Atlante45
46eebe9d40 Give noisy mutes their own packet type 2014-11-17 10:26:47 -08:00
Stephen Birarda
f27367a0c1 fix audio-mixer muting for injectors 2014-11-13 15:00:40 -08:00
Philip Rosedale
17d0f247d6 Switch muting threshold to 0.003 to be a bit less aggressive 2014-11-11 14:10:44 -08:00
Philip Rosedale
d9141b4010 Merge pull request #3750 from Atlante45/reverb_for_own_voice
Reverb for own voice
2014-11-11 10:52:26 -08:00
Atlante45
a868661a25 Extra space 2014-11-10 15:51:31 -08:00
Atlante45
02b401701f Set a minimum mute intervalle in the mixer 2014-11-10 15:46:36 -08:00
Atlante45
edec4d1298 Mixer send mute when if too noisy 2014-11-10 14:10:29 -08:00
Stephen Birarda
2ca673175a rename StdDev to StDev, patch its leak 2014-11-07 17:15:54 -08:00
Philip Rosedale
12eb67c734 fix bug with audio mixer muting too often 2014-11-07 14:18:57 -08:00
Stephen Birarda
0f32346324 resolve conflicts on merge with upstream master 2014-11-07 09:10:12 -08:00
Atlante45
4dc40c9e84 Merge branch 'master' of https://github.com/highfidelity/hifi into reverb_for_own_voice 2014-11-06 23:17:53 +01:00
Stephen Birarda
1a953b5906 migrate node hash calls from AudioMixer to new tbb format 2014-11-06 13:53:10 -08:00
AndrewMeadows
843aaf4e95 Merge pull request #3747 from PhilipRosedale/master
First pass audio mixer muting, improved tour guide, hair, injector loudness in JS
2014-11-06 10:36:46 -08:00
Atlante45
44cb35778a Move AudioEnv packet send to own function
Audio environment packet moved to own function and out of the
if/else
	So it is now sent all the time, now matter if there are other
people around you
2014-11-06 17:42:57 +01:00
Philip Rosedale
688bd0f34f first pass audio mixer automatic muting of noisy streams, tour guide improvements, new lightExample.js, hair hangs over cone 'body' 2014-11-05 16:58:58 -08:00
Stephen Birarda
8a72cdd59d leverage new libcuckoo hash outside LimitedNodeList 2014-11-05 15:09:54 -08:00
Atlante45
fb33634171 ignore penumbra member variable 2014-11-04 16:44:39 +01:00
Atlante45
c7b8f7a792 remove debug #if 2014-11-04 14:00:02 +01:00
Philip Rosedale
cf121a9fe5 Merge branch 'master' of https://github.com/worklist/hifi 2014-10-28 20:22:40 -07:00
Philip Rosedale
f10aeaffab working on audio mixer muting 2014-10-28 20:22:33 -07:00
Philip Rosedale
e5c9ad4525 Merge pull request #3661 from Atlante45/reverb_fixed
Audio Environment packets
2014-10-28 18:11:14 -07:00
Stephen Birarda
d3bbd251db move Logging to LogHandler 2014-10-28 13:59:23 -07:00
Atlante45
12f0237dc7 Cleanup 2014-10-24 15:02:09 -07:00
Atlante45
847ef64b66 move audio env data over to new packet 2014-10-24 14:27:55 -07:00
Atlante45
529a7e0369 CR 2014-10-23 22:55:40 -07:00
Atlante45
d4ec337cae Don't send reverb data as often 2014-10-23 13:39:56 -07:00
Atlante45
9c45055aeb Fixed for no/multiple reverb zones 2014-10-22 23:32:07 -07:00
Atlante45
8ccbfcf695 code cleanup 2014-10-22 16:41:41 -07:00