Commit graph

78 commits

Author SHA1 Message Date
Stephen Birarda
09dee91279 collect agent address on receive to send back audio 2013-02-13 13:42:23 -08:00
Philip Rosedale
9ad121ea00 Now looking up IP address of domain server on startup. 2013-02-13 11:50:10 -08:00
Philip Rosedale
f8cd82bd82 Merge remote-tracking branch 'origin' 2013-02-13 10:53:20 -08:00
Philip Rosedale
ecc7eee161 changed to EC2 domain server by default in interface, increased domain server keep alive timeout to 5 seconds. 2013-02-13 10:53:03 -08:00
Stephen Birarda
f371b5e21c Merge branch 'master' of github.com:worklist/hifi 2013-02-13 10:47:34 -08:00
Stephen Birarda
fb31765024 AudioRingBuffer is a shared class (between mixer and interface) 2013-02-13 10:47:10 -08:00
Philip Rosedale
4ed1971276 Made oscilloscope 2 channel, turned on by default (need to fix injecting the last audio buffer tho). 2013-02-13 10:14:31 -08:00
Philip Rosedale
53a3d1f8c9 Added audio waveform oscilloscope, fixing head rendering of other agents and self. 2013-02-12 23:27:36 -08:00
Philip Rosedale
9d368adcd2 Merge remote-tracking branch 'origin' 2013-02-12 20:48:59 -08:00
Philip Rosedale
8d5a53b2c9 Added agent type to domain server, interface client 2013-02-12 20:48:09 -08:00
Stephen Birarda
fab10ada3e move shared UDPSocket class to shared dir for reuse in mixer 2013-02-12 17:31:53 -08:00
Stephen Birarda
49d7e34cd9 fix casing of util.h import in Agent.cpp 2013-02-12 16:02:07 -08:00
Stephen Birarda
b2c6425f8a Merge branch 'master' of github.com:worklist/hifi 2013-02-12 13:34:14 -08:00
Philip Rosedale
98612c8705 Merge remote-tracking branch 'origin' 2013-02-12 13:18:59 -08:00
Philip Rosedale
a48d9ecd95 Added ping detection between agents 2013-02-12 13:18:19 -08:00
Stephen Birarda
3ebb83f01d keep portaudio build contained to build directory 2013-02-12 13:04:23 -08:00
Stephen Birarda
b426ea52d5 fix unused fread return value warning 2013-02-12 12:11:24 -08:00
Stephen Birarda
04492b28bd link portaudio required libraries after portaudio 2013-02-12 11:44:48 -08:00
Stephen Birarda
0bd62be1c3 Merge branch 'master' of github.com:worklist/hifi 2013-02-12 11:34:23 -08:00
Stephen Birarda
b74e45e675 libraries for portaudio should be linked to interface 2013-02-12 11:33:56 -08:00
Philip Rosedale
6f9d223454 Fixed network-to-host byte order problems when storing ports. 2013-02-12 10:58:30 -08:00
Philip Rosedale
b19fce1b46 close socket added 2013-02-12 01:54:14 -08:00
Philip Rosedale
b651032b06 Merge remote-tracking branch 'origin/master' 2013-02-12 01:52:23 -08:00
Philip Rosedale
82594c31ba stop failing texture load at startup, always show nearby agent count 2013-02-12 01:50:12 -08:00
Philip Rosedale
b58bb6fe80 Head data streaming to other users, domain server improved, network.cpp removed and replaced with UDPSocket objects, input audio drives mouth color and size. 2013-02-12 01:41:36 -08:00
Stephen Birarda
6d67d6f1a6 link required unix libraries to portaudio target 2013-02-11 18:45:18 -08:00
Stephen Birarda
aaf9b73daf add find modules for Jack and librt, link to interface 2013-02-11 18:42:28 -08:00
Stephen Birarda
b20ab5b5ca wrap prefix dir for portaudio config in quotes 2013-02-11 18:15:24 -08:00
Stephen Birarda
d2f38a4c43 ask CMake for absolute path for portaudio configure prefix 2013-02-11 18:08:30 -08:00
Stephen Birarda
788f709193 use absolute path for portaudio install dir 2013-02-11 18:04:22 -08:00
Stephen Birarda
0521a48a72 tell portaudio configure to install to same dir 2013-02-11 18:01:20 -08:00
Stephen Birarda
262b2d82ac Revert "set portaudio install dir to avoid permissions error"
This reverts commit 903bffd797.
2013-02-11 17:42:23 -08:00
Stephen Birarda
903bffd797 set portaudio install dir to avoid permissions error 2013-02-11 17:39:26 -08:00
Stephen Birarda
8fb58221d0 build portaudio from same directory as source 2013-02-11 17:36:41 -08:00
Stephen Birarda
b45286c6e5 add copied AudioRingBuffer for mixer, comment crashing mouse calls 2013-02-11 17:16:18 -08:00
Stephen Birarda
b3375c5e5f fix crash by closing socket before deleting audio data 2013-02-11 17:07:56 -08:00
Stephen Birarda
b3a343f17f build portaudio as external project before interface 2013-02-08 17:28:22 -08:00
Stephen Birarda
99b96ec737 build portaudio library to link with interface 2013-02-08 15:58:12 -08:00
Stephen Birarda
8b18238be3 include cstring for use of strcpy 2013-02-08 15:08:27 -08:00
Stephen Birarda
f1467b2f6c fix incorrect casing on include of Util.h 2013-02-08 15:04:31 -08:00
Stephen Birarda
9dc6c1124b include the correct library for printf 2013-02-08 15:03:17 -08:00
Stephen Birarda
7f0ee90486 include cstring for printf function 2013-02-08 15:02:03 -08:00
Stephen Birarda
9fd14c6403 fix reference to GL libraries for UNIX headers 2013-02-08 14:59:30 -08:00
Stephen Birarda
08142a8adb add header for glut to conditional include in InterfaceConfig 2013-02-08 14:57:59 -08:00
Stephen Birarda
ca0f285abe include InterfaceConfig in Head.cpp for GLUT 2013-02-08 14:51:50 -08:00
Stephen Birarda
d394035e7e switch back to ARB functions with glext include 2013-02-08 14:49:12 -08:00
Stephen Birarda
9095508238 define GL_GLEXT_PROTOTYPES for glPointParameter use 2013-02-08 14:43:22 -08:00
Stephen Birarda
d79bf39a24 using OpenGL later than 2, remove ARB from calls 2013-02-08 14:09:44 -08:00
Stephen Birarda
4983cc6973 conditional include to fix glPointParameterfvARB crash 2013-02-08 14:03:24 -08:00
Stephen Birarda
54b4762830 conditional Apple OS include of call to glPointParameterfvARB 2013-02-08 14:01:35 -08:00