Commit graph

721 commits

Author SHA1 Message Date
Ryan Huffman
607f23618d Fix compiler warning for float->int conversion 2016-01-27 10:36:44 -08:00
Ryan Huffman
a3b2dd2295 Add proper loop handling in injector 2016-01-27 10:14:05 -08:00
Ryan Huffman
b56668892e Fix else style 2016-01-26 09:39:11 -08:00
Ryan Huffman
3160aa3068 Change 0LL to INT64_C(0) 2016-01-26 09:36:52 -08:00
Ryan Huffman
5268ef8ac2 Fix else indentation 2016-01-26 09:36:40 -08:00
Ryan Huffman
0e1742588b Fix indentation 2016-01-26 09:35:35 -08:00
Ryan Huffman
641a6e9c30 Fix injector handling for when it falls behind 2016-01-26 09:29:02 -08:00
Stephen Birarda
ba89c8a97a remove some extra debug that isn't needed 2015-12-21 16:23:23 -07:00
Atlante45
b7478c4594 Fix gcc warning 2015-12-11 16:38:19 -08:00
Ken Cooke
86db12acae Fix naming clash with reserved word 2015-12-07 14:03:11 -08:00
Ken Cooke
4803b3bd9f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-07 13:08:21 -08:00
Ken Cooke
8683bb5002 New reverb parameters 2015-12-07 13:05:30 -08:00
Ryan Huffman
89c412c324 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-12-04 11:38:28 -08:00
Brad Hefta-Gaub
ab63f19b6a Merge pull request #6546 from kencooke/audio-reverb
Reverb
2015-12-04 10:19:56 -08:00
Atlante45
cd26422ca0 Fix warnings on OS X 2015-12-04 08:47:06 -08:00
Ken Cooke
1d01f08324 Fix compiler warnings 2015-12-03 16:27:35 -08:00
Ken Cooke
fbd7549430 Better reverb script defaults 2015-12-02 11:05:06 -08:00
Ken Cooke
f005afd7c0 Fix stdint.h includes 2015-12-02 09:33:47 -08:00
Ken Cooke
a725c8b12e Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-12-01 09:12:24 -08:00
Clément Brisset
e168966b87 Merge pull request #6409 from birarda/injector-hybrid
more efficient threading of networked AudioInjector objects
2015-11-30 15:36:41 -08:00
Ryan Huffman
1b0413f8e3 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:23:40 -08:00
Ryan Huffman
99dd9646bc Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-30 10:20:13 -08:00
Andrew Meadows
49a6f63663 remove whitespace and fix warning (unused var) 2015-11-30 10:00:05 -08:00
Andrew Meadows
e26081e981 always update physics properties when they change
and move activation check logic to MotionState
2015-11-24 10:20:19 -08:00
Stephen Birarda
c8b5f6f737 fix for top on deque when empty 2015-11-20 16:03:18 -08:00
Stephen Birarda
9ddebc8d13 resolve conflicts on merge with upstream/master 2015-11-20 15:29:44 -08:00
Stephen Birarda
5f9c3eea76 use a priority queue to ensure ordering of injectors 2015-11-19 17:42:14 -08:00
Stephen Birarda
adf41fce19 use alias for unique_lock and mutex 2015-11-19 17:29:20 -08:00
Stephen Birarda
3b56df6e99 use deleteLater immediately not that finish is right thread 2015-11-19 17:27:18 -08:00
Ryan Huffman
07d21514c5 Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message 2015-11-19 10:47:37 -08:00
Ken Cooke
2c98976ef2 Fix bug from implicit cast 2015-11-19 10:05:10 -08:00
Ken Cooke
998f6e099f Merge branch 'master' of https://github.com/highfidelity/hifi into audio-reverb 2015-11-19 08:39:55 -08:00
Ken Cooke
2489eaa30e Changed the audio pipeline to allow stereo reverberation, using separate source (loopback audio) and listener (received audio) reverbs. 2015-11-19 08:32:13 -08:00
Ryan Huffman
2a416ebc61 Merge branch 'master' of https://github.com/highfidelity/hifi into received-message 2015-11-18 16:52:23 -08:00
Brad Davis
5b8047ded4 Make recording and playback work in interface, playback in agent 2015-11-18 14:04:45 -08:00
Ken Cooke
cc90662bf0 PR feedback 2015-11-18 12:17:27 -08:00
Ken Cooke
8ae3fa61c5 Fix compiler issues 2015-11-18 10:06:40 -08:00
Ken Cooke
0f214555c1 New algorithmic stereo reverb 2015-11-18 09:13:03 -08:00
Stephen Birarda
2aa56b5384 include memory header for unique_ptr 2015-11-17 17:26:45 -08:00
Stephen Birarda
35dd5fb564 include NLPacket in AudioInjector for unique_ptr 2015-11-17 17:26:07 -08:00
Stephen Birarda
1c485bacff include the condition_variable header in AIM 2015-11-17 17:11:40 -08:00
Stephen Birarda
d20fd6d7e7 cap max to 40, clarify comment 2015-11-17 17:08:48 -08:00
Stephen Birarda
cf2ad9a877 remove atomic include from AudioInjector 2015-11-17 17:07:29 -08:00
Stephen Birarda
62b218632d don't use unneeded atomic for AudioInjector State 2015-11-17 17:06:21 -08:00
Stephen Birarda
8e4d7c69ce handle AudioInjectorManager for scripted ACs 2015-11-17 17:01:11 -08:00
Stephen Birarda
935c0cc137 handle AudioInjectorManager cleanup in Application 2015-11-17 16:39:23 -08:00
Stephen Birarda
ab5c8e072f handle blocked AudioInjectorManager for restart 2015-11-17 16:31:18 -08:00
Stephen Birarda
d764ff2e87 remove static variables in AudioInjector.cpp 2015-11-17 15:12:04 -08:00
Stephen Birarda
7da6ec46c4 more handling of various AudioInjector states 2015-11-17 14:20:59 -08:00
Stephen Birarda
4fa934dccf make sure AudioInjectorManager process is on AI thread 2015-11-16 18:54:16 -08:00