ZappoMan
|
7a993939bf
|
Merge branch 'master' of https://github.com/worklist/hifi into moonshot
Conflicts:
interface/interface_en.ts
interface/src/Application.cpp
interface/src/Application.h
interface/src/Menu.h
libraries/shared/src/SharedUtil.h
|
2014-04-14 09:43:29 -07:00 |
|
Stephen Birarda
|
54647f0f08
|
make sure gnutls define for ssize_t comes before gnutls include
|
2014-04-10 10:27:08 -07:00 |
|
Stephen Birarda
|
2518d314ac
|
add ssize_t definition for gnutls.h include on Windows
|
2014-04-10 10:19:45 -07:00 |
|
Stephen Birarda
|
16bb28a4fa
|
make GnuTLS a system include to suppress warnings
|
2014-04-10 10:04:02 -07:00 |
|
Stephen Birarda
|
68c445e718
|
link GnuTLS to targets linking the networking library
|
2014-04-10 10:00:10 -07:00 |
|
Stephen Birarda
|
d5d52f804f
|
add a networking library and link from appropriate targets
|
2014-04-10 09:32:17 -07:00 |
|
Stephen Birarda
|
1c861fbecb
|
resolve conflicts on merge with upstream master
|
2014-04-09 15:36:15 -07:00 |
|
Stephen Birarda
|
ae4b8348a2
|
fix header include guards via regex
|
2014-04-09 12:03:17 -07:00 |
|
Stephen Birarda
|
2d755adfc0
|
repairs to good code blown away by regex
|
2014-04-09 10:46:20 -07:00 |
|
Stephen Birarda
|
684c6b5372
|
run regex header replacement on all cpp files
|
2014-04-09 09:35:42 -07:00 |
|
Stephen Birarda
|
6a51df9e38
|
initial regex replacement of headers
|
2014-04-08 17:30:36 -07:00 |
|
ZappoMan
|
b56e0ff3d4
|
tweaks to audioring buffer
|
2014-04-04 07:04:48 -07:00 |
|
ZappoMan
|
3808cfa83d
|
latest work
|
2014-04-03 08:55:48 -07:00 |
|
ZappoMan
|
42efb0db65
|
glue in processSpatialAudio()
|
2014-04-02 18:18:17 -07:00 |
|
Stephen Birarda
|
e1cae6d295
|
initial handshaking for DTLS sessions between DS and clients
|
2014-04-02 17:29:14 -07:00 |
|
Stephen Birarda
|
e2b230445f
|
add a method to Agent for last read frame loudness
|
2014-03-26 10:28:59 -07:00 |
|
Andrew Meadows
|
c0177e80a7
|
use glm::isnan() everywhere for portable code
|
2014-03-25 09:56:15 -07:00 |
|
Stephen Birarda
|
af4fb26031
|
floats are important
|
2014-03-21 18:44:59 -07:00 |
|
Stephen Birarda
|
abd6c8a747
|
fix trailing average on ring buffer, remove unused constant
|
2014-03-21 18:28:12 -07:00 |
|
Stephen Birarda
|
bad209bf09
|
use a trailing average for a quieter loudness
|
2014-03-21 15:53:00 -07:00 |
|
Stephen Birarda
|
1580896ec4
|
don't use a trailing average for loudness
|
2014-03-21 11:42:02 -07:00 |
|
Stephen Birarda
|
5a6456c29f
|
use an epsilon value to drop average loudness to zero
|
2014-03-21 11:29:16 -07:00 |
|
Stephen Birarda
|
6f37bb54f8
|
suppress useless audio debug
|
2014-03-21 10:19:17 -07:00 |
|
Stephen Birarda
|
5ae63c5b0f
|
use a trailing average for sleep time, move loudness to RB
|
2014-03-20 17:10:24 -07:00 |
|
Stephen Birarda
|
a8ef64e0ce
|
calculate a cutoff loudness for mixer recovery
|
2014-03-20 12:52:17 -07:00 |
|
Stephen Birarda
|
f80a077637
|
fix memory overrun from silent sample writing
|
2014-03-18 13:33:29 -07:00 |
|
Stephen Birarda
|
9fbb4f1428
|
spacing fix and silent sample read fix
|
2014-03-18 13:04:28 -07:00 |
|
Stephen Birarda
|
e7acd0bad3
|
don't use QDataStream in parseData since we don't really need it
|
2014-03-18 12:58:29 -07:00 |
|
Stephen Birarda
|
7ed982a073
|
cleanup writing of silent frame to ring buffer
|
2014-03-18 11:12:36 -07:00 |
|
Stephen Birarda
|
61594b9a1e
|
fixes to silent audio frame sending
|
2014-03-17 16:27:49 -07:00 |
|
Stephen Birarda
|
9f24bd9c47
|
have the AudioMixer handle silent audio, send silence from Interface when gate closed
|
2014-03-17 15:12:02 -07:00 |
|
Stephen Birarda
|
1428d2d1de
|
take an absolute value for correct loudness
|
2014-03-17 14:35:04 -07:00 |
|
Stephen Birarda
|
bc9deb5db7
|
handle trivial case of not mixing silent audio streams
|
2014-03-17 14:29:53 -07:00 |
|
Stephen Birarda
|
72449fdb6a
|
initial optimizations to AudioMixer with mmx additions
|
2014-03-14 17:50:57 -07:00 |
|
Andrew Meadows
|
aa8c2fc8cb
|
use radians instead of degrees (almost) everywhere
|
2014-03-11 17:26:58 -07:00 |
|
ZappoMan
|
1ceb05bf09
|
click harder
|
2014-03-08 18:22:30 -08:00 |
|
Stephen Birarda
|
bb3a8677be
|
Merge branch 'master' of https://github.com/highfidelity/hifi into cmake-quotes
|
2014-03-03 16:31:25 -08:00 |
|
Stephen Birarda
|
628f91cd73
|
complete quoting of varous Cmake commands, closes #1999
|
2014-03-03 12:15:05 -08:00 |
|
Stephen Birarda
|
60eb588e96
|
remove some unecessary null pointer checks
|
2014-03-03 11:36:01 -08:00 |
|
ZappoMan
|
59eefa314c
|
add support for Audio.startDrumSound() to allow drum sound procedural audio in JS
|
2014-03-03 03:17:16 -08:00 |
|
ZappoMan
|
2c7d9d7a06
|
removed unneeded class declaration
|
2014-03-03 00:35:46 -08:00 |
|
ZappoMan
|
6ddc6132fd
|
removed unneeded class def
|
2014-03-02 21:53:36 -08:00 |
|
Philip Rosedale
|
70c1f8290e
|
assume RAW audio if not processed as WAV
|
2014-02-25 13:21:02 -08:00 |
|
ZappoMan
|
09fc58763f
|
Merge pull request #2054 from gaitat/19499
Worklist Job #19499
|
2014-02-24 19:10:31 -08:00 |
|
gaitat
|
a1e773eb2d
|
Worklist Job #19499
Kick of the build
|
2014-02-23 11:24:45 -05:00 |
|
gaitat
|
edd99f93de
|
Worklist Job #19499 Mac compile fix
third time's the charm
|
2014-02-21 21:48:44 -05:00 |
|
gaitat
|
e2b20d2475
|
Worklist Job #19499 Mac compile fix
|
2014-02-21 21:13:31 -05:00 |
|
gaitat
|
e331dc529d
|
Worklist Job #19499
Add WAV file support to Javascript
|
2014-02-21 19:26:19 -05:00 |
|
Stephen Birarda
|
ee9f8937e3
|
fix a silly typo
|
2014-02-19 18:03:34 -08:00 |
|
Stephen Birarda
|
7ceacd2751
|
remove blank if and fix ping reply construction
|
2014-02-07 10:24:01 -08:00 |
|
Stephen Birarda
|
b988308a8d
|
leverage writeDatagram helper in NodeList, ping if no active socket
|
2014-02-07 09:49:54 -08:00 |
|
Stephen Birarda
|
a823722d27
|
add writeDatagram helper to NodeList to insert md5 hash
|
2014-02-06 14:28:58 -08:00 |
|
Stephen Birarda
|
96fd73a766
|
fixed wrapped read of samples from end of buffer
|
2014-02-05 11:39:03 -08:00 |
|
Andrzej Kapolka
|
1e9e298a75
|
Missing includes.
|
2014-01-29 13:47:13 -08:00 |
|
Stephen Birarda
|
4de270b832
|
cleanup Node types, closes #1726
|
2014-01-28 13:38:33 -08:00 |
|
Stephen Birarda
|
3854f75abd
|
cleanup some UUID packing
|
2014-01-28 10:41:40 -08:00 |
|
Stephen Birarda
|
4103cc1cde
|
packet header changes and beginning of conversion to QByteArray
|
2014-01-28 10:36:08 -08:00 |
|
Stephen Birarda
|
8d2e9823de
|
remove notion of owning node from NodeData
|
2014-01-23 17:06:03 -08:00 |
|
Brad Hefta-Gaub
|
170dbe6e85
|
Merge branch 'master' of git://github.com/worklist/hifi into windows_build
Conflicts:
assignment-client/src/audio/AudioMixer.cpp
domain-server/src/DomainServer.cpp
interface/src/Audio.cpp
interface/src/DataServerClient.cpp
interface/src/Oscilloscope.cpp
interface/src/PairingHandler.cpp
interface/src/Util.cpp
interface/src/avatar/MyAvatar.cpp
interface/src/devices/Faceshift.cpp
interface/src/devices/SerialInterface.cpp
interface/src/renderer/FBXReader.cpp
libraries/avatars/src/AvatarData.h
libraries/octree-server/src/OctreeServer.cpp
libraries/octree-server/src/OctreeServer.h
libraries/octree/src/ViewFrustum.cpp
libraries/shared/src/Logging.cpp
libraries/shared/src/Node.cpp
libraries/shared/src/Node.h
libraries/shared/src/NodeList.cpp
libraries/shared/src/NodeList.h
libraries/shared/src/PerfStat.cpp
libraries/shared/src/SharedUtil.cpp
libraries/voxels/src/VoxelTree.cpp
voxel-edit/src/main.cpp
|
2014-01-15 10:20:21 -08:00 |
|
Stephen Birarda
|
599e3bb9e5
|
resolve conflicts on merge with upstream master
|
2014-01-14 16:15:58 -08:00 |
|
Stephen Birarda
|
767a241105
|
Merge remote-tracking branch 'upstream/master' into nodelist-container
|
2014-01-14 16:08:58 -08:00 |
|
Stephen Birarda
|
bcf9e04f56
|
only output first starve for a PositionalAudioRingBuffer
|
2014-01-14 14:34:00 -08:00 |
|
Stephen Birarda
|
987c639e36
|
initial newline removal from all QDebug calls
|
2014-01-14 13:09:22 -08:00 |
|
Stephen Birarda
|
7d1a64ca8c
|
change NodeList container to QHash with QSharedPointer
|
2014-01-13 17:09:21 -08:00 |
|
Brad Hefta-Gaub
|
9e24996f39
|
more isnan() hacks
|
2014-01-12 23:11:06 -08:00 |
|
Brad Hefta-Gaub
|
19012e2f6d
|
more windows build fixes isnan
|
2014-01-12 22:05:55 -08:00 |
|
Brad Hefta-Gaub
|
f9f29c68b2
|
more windows build fixes
|
2014-01-11 01:11:49 -08:00 |
|
Brad Hefta-Gaub
|
9dea84c227
|
more windows build fixes
|
2014-01-11 00:45:45 -08:00 |
|
Brad Hefta-Gaub
|
cb828d330a
|
more windows build fixes
|
2014-01-11 00:43:47 -08:00 |
|
Brad Hefta-Gaub
|
148cde30a0
|
make it work on unix, mac, and windows
|
2014-01-10 22:15:41 -08:00 |
|
Brad Hefta-Gaub
|
46c45da842
|
std::min() compiler error on windows
|
2014-01-10 22:11:20 -08:00 |
|
Stephen Birarda
|
32be6199fd
|
fix reference to downloaded byte array samples
|
2014-01-05 17:41:33 -08:00 |
|
Stephen Birarda
|
a06f18328c
|
add downsampling so RAW audio for sound assumed to be 48Khz
|
2014-01-05 17:40:37 -08:00 |
|
Stephen Birarda
|
5b272bfd6a
|
fix random UUID creation for injected audio
|
2014-01-05 17:09:57 -08:00 |
|
Stephen Birarda
|
decaf2e245
|
add property for volume in AudioInjectorOptions
|
2014-01-03 14:17:12 -08:00 |
|
Stephen Birarda
|
a4f2735739
|
fix a glaring omission - actually move the audioInjector to QThread
|
2014-01-03 10:39:09 -08:00 |
|
Stephen Birarda
|
a61e214c9a
|
simplify loopback trigger for injected audio
|
2014-01-03 10:16:59 -08:00 |
|
Stephen Birarda
|
6f60a22c07
|
fix copyright years
|
2014-01-03 09:50:13 -08:00 |
|
Stephen Birarda
|
2a422b84f2
|
fix broken build by removing ASI as friend to AI
|
2014-01-03 09:49:32 -08:00 |
|
Stephen Birarda
|
339ef93fc4
|
remove no longer needed QDebug includes
|
2014-01-03 09:41:01 -08:00 |
|
Stephen Birarda
|
f24eff33fe
|
open up ASI playSound method to ScriptEngine
|
2014-01-03 09:38:05 -08:00 |
|
Stephen Birarda
|
443c94a88f
|
repairs to AudioMixer and audio injection flow
|
2014-01-02 17:15:46 -08:00 |
|
Stephen Birarda
|
594bd58774
|
add AudioScriptingInterface to expose playSound to JS
|
2014-01-02 15:35:28 -08:00 |
|
Stephen Birarda
|
845176bbc6
|
expose Sound to ScriptEngine
|
2014-01-02 15:14:28 -08:00 |
|
Stephen Birarda
|
8cc4a33ad3
|
repair AudioInjector threading
|
2014-01-02 13:35:56 -08:00 |
|
Stephen Birarda
|
3a45fb8533
|
cleanup new API for sound injection
|
2014-01-02 12:31:01 -08:00 |
|
Stephen Birarda
|
674c19a570
|
leverage new AudioInjector API for throw and catch sounds
|
2014-01-02 12:17:18 -08:00 |
|
Stephen Birarda
|
3123b83d0b
|
audio API changes to allow multiple injections of single sound
|
2014-01-02 11:53:33 -08:00 |
|
Stephen Birarda
|
87e5579e52
|
reinstate delete for starved but started audio ring buffers
|
2013-12-19 15:51:14 -08:00 |
|
Stephen Birarda
|
0446aeb4d3
|
loopback injected sound effects to the node by default
|
2013-12-19 15:44:47 -08:00 |
|
Stephen Birarda
|
80a2bd0844
|
move _shouldLoopbackForNode to PositionalAudioRingBuffer for access in injector
|
2013-12-19 15:44:04 -08:00 |
|
Stephen Birarda
|
8681e66ed3
|
default to max volume, add a bool flag for loopback
|
2013-12-19 15:30:33 -08:00 |
|
Stephen Birarda
|
534010347b
|
add a volume setter to the AudioInjector
|
2013-12-19 15:28:10 -08:00 |
|
Stephen Birarda
|
7ed609633a
|
complete the test injector stub
|
2013-12-19 15:23:31 -08:00 |
|
Stephen Birarda
|
bdf8c4b9b2
|
implement threaded send for AudioInjector
|
2013-12-19 15:17:03 -08:00 |
|
Stephen Birarda
|
2409b5f784
|
complete inital test of AudioInjector API
|
2013-12-19 13:46:37 -08:00 |
|
Stephen Birarda
|
b035f74f94
|
fix for build busters with changed AbstractAudioInterface
|
2013-12-19 12:39:57 -08:00 |
|
Stephen Birarda
|
eac3b6be65
|
add AudioInjector class to pull samples from URL and inject
|
2013-12-19 12:28:37 -08:00 |
|
Stephen Birarda
|
589dde5139
|
more stubbing of AudioInjectionManager
|
2013-12-17 16:07:18 -08:00 |
|
Stephen Birarda
|
db8661f152
|
add a stubbed AudioInjectionManager
|
2013-12-17 14:13:23 -08:00 |
|
Stephen Birarda
|
ff0d31857a
|
correct sample delay pulls with negative index
|
2013-12-17 11:47:50 -08:00 |
|
Philip Rosedale
|
03869e81fd
|
Merge pull request #1380 from birarda/qt-for-portaudio
move from 44.1 to 48 on audio
|
2013-12-16 17:58:41 -08:00 |
|
Stephen Birarda
|
bb93c64d8d
|
some initial audio stat render fixes
|
2013-12-16 16:21:50 -08:00 |
|
Stephen Birarda
|
6b644eb130
|
repair upsampling and local loopback by correcting for limits
|
2013-12-16 15:15:25 -08:00 |
|
Stephen Birarda
|
1f9ca00317
|
drive input from buffer callback and output from network
|
2013-12-16 11:58:23 -08:00 |
|
ZappoMan
|
5830f1134e
|
add particle collisions with voxels
|
2013-12-12 17:52:22 -08:00 |
|
Stephen Birarda
|
f17ee1af7a
|
cleanup AudioRingBuffer API
|
2013-12-12 13:37:18 -08:00 |
|
Stephen Birarda
|
b06af3cd6c
|
copy all passed samples to AudioRingBuffer
|
2013-12-12 10:15:43 -08:00 |
|
Stephen Birarda
|
af2fa15f55
|
initial work for change to 48KHz
|
2013-12-11 12:02:08 -08:00 |
|
Stephen Birarda
|
7df6210ba0
|
Merge remote-tracking branch 'upstream/master' into qt-for-portaudio
|
2013-12-04 14:20:44 -08:00 |
|
Stephen Birarda
|
e339155328
|
replace missing PortAudio with Qt audio
|
2013-12-04 12:54:33 -08:00 |
|
Stephen Birarda
|
141394a664
|
replace UDPSocket with QUDPSocket
|
2013-12-02 13:34:29 -08:00 |
|
Stephen Birarda
|
00446076b5
|
remove audio injectors that are starved and not added
|
2013-10-21 16:04:13 -07:00 |
|
Stephen Birarda
|
fbb097accb
|
remove leftover listening mode, fix UUID push in InjectedAudioRingBuffer
|
2013-10-21 15:03:07 -07:00 |
|
Stephen Birarda
|
b3909da5f0
|
audio injector requires two UUIDs
|
2013-10-18 17:37:25 -07:00 |
|
Stephen Birarda
|
4fe2e25bf0
|
add a stream identifier back to the audio injector
|
2013-10-18 17:36:59 -07:00 |
|
Stephen Birarda
|
7da1f5a235
|
add AudioMixerClientData to hold vector of PositionalAudioRingBuffer
|
2013-10-18 17:32:53 -07:00 |
|
Stephen Birarda
|
7d48c9b3bd
|
don't attempt to inject if audio mixer has no active socket
|
2013-10-17 16:49:05 -07:00 |
|
Stephen Birarda
|
74e66dfd35
|
push various PACKET_TYPES, repairs to Agent for UUID setup
|
2013-10-17 13:35:53 -07:00 |
|
Stephen Birarda
|
1c70e09178
|
repairs to audio exchange for new UUID setup
|
2013-10-17 11:58:52 -07:00 |
|
Stephen Birarda
|
fa146e302d
|
remove 16-bit node IDs and replace with UUIDs
|
2013-10-17 11:49:41 -07:00 |
|
Stephen Birarda
|
ef655f5e78
|
clear agent audio injector after send, don't send if empty
|
2013-10-16 11:50:19 -07:00 |
|
Stephen Birarda
|
0eae0f129c
|
allow audio injection from javascript
|
2013-10-11 17:37:48 -07:00 |
|
Stephen Birarda
|
0477ad79dd
|
add methods to set/get samples and volume
|
2013-10-03 13:22:02 -07:00 |
|
Stephen Birarda
|
e977d28fe3
|
replace QVariantMap glm::vec3 setters with conversions for QScriptValue
|
2013-10-03 11:55:30 -07:00 |
|
Stephen Birarda
|
a07b673f69
|
beginning of hook of AudioInjector into JS
|
2013-10-03 11:41:45 -07:00 |
|
Stephen Birarda
|
17fda717fe
|
move audio and avatar classes into assignment-client target
|
2013-09-17 11:04:46 -07:00 |
|
Stephen Birarda
|
5ac694224e
|
remove extra space at the top of AudioMixer
|
2013-09-13 11:24:56 -07:00 |
|
Stephen Birarda
|
d089991237
|
add handling of Agent assignments to Assignment, DS, AC
|
2013-09-13 11:14:00 -07:00 |
|
Stephen Birarda
|
b0c9dfeddc
|
more leveraging of standardized logging
|
2013-09-09 14:47:15 -07:00 |
|
Stephen Birarda
|
8077963bb1
|
add standardized logging and leverage forked assignment clients
|
2013-09-09 14:21:33 -07:00 |
|
Stephen Birarda
|
9eef894e24
|
add doxygen documentation for Assignment classes
|
2013-09-06 14:35:59 -07:00 |
|
Stephen Birarda
|
f7b0158cfe
|
use deque of pointers, make sure DS silent count is refreshed
|
2013-09-06 10:26:29 -07:00 |
|
Stephen Birarda
|
9244ec1c25
|
have client keep track of number of silent DS checkins
|
2013-09-06 09:41:27 -07:00 |
|
Stephen Birarda
|
232f79489d
|
decouple AM logic from main.cpp to be assignable
|
2013-08-22 13:12:53 -07:00 |
|
Stephen Birarda
|
1f8031770b
|
fix quoted includes in AudioInjector.cpp
|
2013-08-05 10:28:12 -07:00 |
|
Stephen Birarda
|
553c8088dd
|
fix include from AudioInjector.h
|
2013-08-05 10:27:06 -07:00 |
|
Stephen Birarda
|
8f876b91ae
|
changes for stub pull request of assignee work
|
2013-08-05 10:06:50 -07:00 |
|
Stephen Birarda
|
9834c10610
|
movement to use AudioInjector classes in Operative code
|
2013-07-11 17:47:35 -07:00 |
|
Stephen Birarda
|
d6601ad333
|
resolve conflicts on merge with upstream master
|
2013-07-11 14:33:50 -07:00 |
|
Stephen Birarda
|
38a33e0283
|
couple more type squishes
|
2013-07-11 11:11:39 -07:00 |
|
Stephen Birarda
|
fcb8865d2e
|
resolve conflicts on merge with upstream master
|
2013-07-11 10:58:45 -07:00 |
|
Stephen Birarda
|
ca8f25955a
|
switch usec timestamps to uint64_t
|
2013-07-10 11:46:48 -07:00 |
|
Stephen Birarda
|
68357ab6f7
|
include correct quaternion header for AudioInjector and Operative
|
2013-07-09 11:57:54 -07:00 |
|
Stephen Birarda
|
3cee9b1ab5
|
remove redundant UDPSocket include
|
2013-07-08 17:59:27 -07:00 |
|
Stephen Birarda
|
7fa3052308
|
remove double glm includes
|
2013-07-08 17:48:46 -07:00 |
|
Stephen Birarda
|
81e6bccd08
|
use packet version helpers in parseData methods
|
2013-07-08 14:13:36 -07:00 |
|
Stephen Birarda
|
8f7a3f3567
|
use packet version helpers for PACKET_TYPE_INJECT_AUDIO
|
2013-07-08 14:07:34 -07:00 |
|
Stephen Birarda
|
5062ae8965
|
rename PACKET_HEADER to PACKET_TYPE, fix DS packet versioning
|
2013-07-08 11:37:39 -07:00 |
|
Stephen Birarda
|
36c6912de8
|
your agents are now nodes
|
2013-07-03 10:35:09 -07:00 |
|
tosh
|
f1e5a56347
|
adds code to show bandwidth details upon click and adds a checkbox to the menu to set visibility of the bandwidth bars
|
2013-06-30 17:08:01 +02:00 |
|
Stephen Birarda
|
cece4de90e
|
fix the default orientation for an injector
|
2013-06-27 11:14:22 -07:00 |
|
Philip Rosedale
|
13b729d9b4
|
Fixed problems with ring buffer not handling stereo right, reset audio buffers on spacebar.
|
2013-06-20 18:49:05 -07:00 |
|
Philip Rosedale
|
2c8c34f9bd
|
set jitter buffer on application start to 1/2 of a packet
|
2013-06-20 09:08:37 -07:00 |
|
Stephen Birarda
|
a141e3dc5d
|
resolve conflicts on merge with upstream master
|
2013-06-13 16:31:40 -06:00 |
|
Andrzej Kapolka
|
db729a04aa
|
Converted double timestamps to long long (64 bit integers), fixed bug with
updating agent timestamps.
|
2013-06-13 11:11:59 -07:00 |
|
Stephen Birarda
|
84422628a9
|
remove thread link to audio library
|
2013-06-11 14:50:10 -07:00 |
|
Stephen Birarda
|
233ce67379
|
don't link STK library while not being used
|
2013-06-06 11:57:38 -07:00 |
|
Stephen Birarda
|
beb415a851
|
correct buffer byte constants in AudioRingBuffer
|
2013-06-05 12:45:07 -07:00 |
|
Stephen Birarda
|
d64b46a6b2
|
add specialized parsing of audio data to ARB subclasses
|
2013-06-05 12:11:56 -07:00 |
|
Stephen Birarda
|
4cb00ad54b
|
clean up AudioRingBuffer by subclassing
|
2013-06-05 11:51:21 -07:00 |
|
Stephen Birarda
|
eee7d6f92f
|
resolve some conflicts on merge with upstream master
|
2013-06-05 09:56:26 -07:00 |
|
Stephen Birarda
|
6c2dcb86c8
|
Merge remote-tracking branch 'upstream/master' into synthesis
|
2013-06-05 09:55:16 -07:00 |
|
Stephen Birarda
|
bfad6c8f61
|
fix orientation setter in AudioInjector header
|
2013-06-04 16:10:20 -07:00 |
|
Stephen Birarda
|
7d3d8f8b43
|
rewrite the AudioInjector to send an orientation quaternion instead of bearing
|
2013-06-04 15:31:11 -07:00 |
|
Stephen Birarda
|
cd79339670
|
rework audio-mixer to use orientations sent by clients
|
2013-06-04 15:18:05 -07:00 |
|
Stephen Birarda
|
d02fb65a13
|
Merge remote-tracking branch 'upstream/master' into cube-injector
|
2013-06-04 11:25:39 -07:00 |
|
Stephen Birarda
|
3f7fbb5c1e
|
change injector from cube to sphere
|
2013-06-04 10:57:53 -07:00 |
|
Stephen Birarda
|
c55b6a20d7
|
parse the desired cube side length for injected audio source
|
2013-06-03 15:38:12 -07:00 |
|
Stephen Birarda
|
ca39593f05
|
move typedef for FreeVerbAgentMap to AudioRingBuffer header
|
2013-06-03 12:02:41 -07:00 |
|
Stephen Birarda
|
2d7c397138
|
create a FreeVerb object for each other agent per agent
|
2013-05-31 15:47:57 -07:00 |
|
ZappoMan
|
b0397e8eb9
|
Merge branch 'master' of https://github.com/worklist/hifi into copy_and_paste_voxels
|
2013-05-30 21:41:55 -07:00 |
|
Stephen Birarda
|
c259b025db
|
fix a crash in audio injector when there is no audio mixer
|
2013-05-29 15:05:39 -07:00 |
|
Stephen Birarda
|
56e0e3882d
|
kill agents who send NaN bearings
|
2013-05-29 11:29:38 -07:00 |
|
Stephen Birarda
|
1fb61faded
|
fix the isnan check for agent bearing
|
2013-05-29 11:22:25 -07:00 |
|
Stephen Birarda
|
f45062a097
|
don't use audio when the bearing sent by the agent is garbage
|
2013-05-29 11:14:50 -07:00 |
|
Stephen Birarda
|
78df9fb2ed
|
last pieces of debugging for mixer crash
|
2013-05-29 11:04:46 -07:00 |
|
ZappoMan
|
eb675c8dd7
|
fix crash when no audio mixer available
|
2013-05-29 08:25:30 -07:00 |
|
Stephen Birarda
|
c661796b81
|
don't copy audio data if the agent sent the wrong amount
|
2013-05-24 15:37:48 -07:00 |
|
Stephen Birarda
|
36892da488
|
keep a pointer to owning agent in AgentData
|
2013-05-24 12:17:34 -07:00 |
|
Stephen Birarda
|
842ef820ab
|
use a more consistent method to clock the injector thread
|
2013-05-23 13:56:16 -07:00 |
|
Stephen Birarda
|
21cdf4ada5
|
remove setter for isInjectingAudio - shouldn't be set externally
|
2013-05-22 17:23:46 -07:00 |
|
Stephen Birarda
|
dae7bf8674
|
use AgentList defaults when AIM has no socket or address set
|
2013-05-20 11:48:50 -07:00 |
|
Stephen Birarda
|
00998ba75e
|
some fixes for new audio injector setup
|
2013-05-17 15:42:37 -07:00 |
|
Stephen Birarda
|
d72b931ebe
|
attach stream identifier to AudioRingBuffer to match incoming data in audio mixer
|
2013-05-17 14:57:10 -07:00 |
|
Stephen Birarda
|
b7b39c2a6e
|
have addOrUpdateAgent return a pointer to the agent instead of a bool
|
2013-05-17 14:03:15 -07:00 |
|
Stephen Birarda
|
fcfe5c9e25
|
disallow copying for AudioRingBuffer objects
|
2013-05-17 12:27:05 -07:00 |
|
Stephen Birarda
|
442d658835
|
switch from 255 to 0xFF for max volume constant
|
2013-05-16 14:10:48 -07:00 |
|
Stephen Birarda
|
a37b451993
|
add constants for volume byte values
|
2013-05-16 14:09:50 -07:00 |
|
Stephen Birarda
|
f6cc40362c
|
hook the injector up to the change AudioInjector setup
|
2013-05-16 13:10:48 -07:00 |
|
Stephen Birarda
|
a2f8d8ae25
|
break audio out of shared into its own library
|
2013-05-16 13:00:40 -07:00 |
|