Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-15 12:16:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
9610 commits 25 branches 0 tags 1.1 GiB
Commit graph

142 commits

Author SHA1 Message Date
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