Stephen Birarda
|
a33a2afcb6
|
move interface externals to its directory
|
2013-02-14 15:26:05 -08:00 |
|
Stephen Birarda
|
a5d08142e1
|
create target for shared hifi library
|
2013-02-14 15:25:50 -08:00 |
|
Philip Rosedale
|
c360fabd96
|
Domain IP is used if static, else looked up.
|
2013-02-14 13:20:06 -08:00 |
|
Philip Rosedale
|
10ff074e38
|
Don't render head if you are inside it (it's your own)
|
2013-02-14 13:14:01 -08:00 |
|
Stephen Birarda
|
864bcb0a03
|
Merge branch 'master' of github.com:worklist/hifi
|
2013-02-13 20:43:20 -08:00 |
|
Stephen Birarda
|
9c822b9d58
|
dynamic switchover of audio mixer
|
2013-02-13 20:43:10 -08:00 |
|
Philip Rosedale
|
49201efbb1
|
Merge remote-tracking branch 'origin'
|
2013-02-13 20:40:38 -08:00 |
|
Philip Rosedale
|
12e4e15b21
|
It's entirely possible that the serialInterface reader is a tiny bit better, but I'm really not sure. :) Fixed bug with reading from middle of serial string on startup causing hang.
|
2013-02-13 20:40:00 -08:00 |
|
Stephen Birarda
|
7f35fe9993
|
fix agent comparison for add of agent
|
2013-02-13 20:17:35 -08:00 |
|
Stephen Birarda
|
9de42bdf75
|
same IP but different port is a new agent
|
2013-02-13 19:36:42 -08:00 |
|
Stephen Birarda
|
5196a1ba1b
|
remove incorrect threaded agent processing, fix agent replacement
|
2013-02-13 17:52:10 -08:00 |
|
Stephen Birarda
|
ff83335123
|
undo solo test for mixer, add localhost mixer const to Audio.cpp
|
2013-02-13 16:19:31 -08:00 |
|
Stephen Birarda
|
4270cfe2b4
|
send client their own packet for solo mixer testing
|
2013-02-13 16:14:04 -08:00 |
|
Stephen Birarda
|
4fc9dd6323
|
fix use of undeclared identifier
|
2013-02-13 15:29:47 -08:00 |
|
Stephen Birarda
|
815783732c
|
make UDPSocket non-blocking, thread receive of data in interface
|
2013-02-13 15:27:16 -08:00 |
|
Stephen Birarda
|
5ced381097
|
store number of sentBytes returned from UDPSocket
|
2013-02-13 14:54:39 -08:00 |
|
Stephen Birarda
|
a725db5bd7
|
compare ports of same endianess for agent comparison
|
2013-02-13 14:06:06 -08:00 |
|
Stephen Birarda
|
28beb3ecfc
|
undo changes to interface constants
|
2013-02-13 13:44:26 -08:00 |
|
Stephen Birarda
|
09dee91279
|
collect agent address on receive to send back audio
|
2013-02-13 13:42:23 -08:00 |
|
Stephen Birarda
|
3d874357d7
|
bust TreeNode out into seperate class
|
2013-02-13 13:03:03 -08:00 |
|
Stephen Birarda
|
ff4527904f
|
fix src directory variable name in space CMakeList
|
2013-02-13 12:55:03 -08:00 |
|
Stephen Birarda
|
d3348f4de2
|
make changes suggested in PR #9
|
2013-02-13 12:50:26 -08:00 |
|
birarda
|
a6a2341160
|
Merge pull request #9 from murillodigital/master
Space Server - Initial Commit
|
2013-02-13 12:46:34 -08:00 |
|
Philip Rosedale
|
2446e80c6c
|
Merge remote-tracking branch 'origin'
|
2013-02-13 11:50:59 -08:00 |
|
Philip Rosedale
|
9ad121ea00
|
Now looking up IP address of domain server on startup.
|
2013-02-13 11:50:10 -08:00 |
|
Stephen Birarda
|
cee7f89b67
|
link thread library to proper target for mixer
|
2013-02-13 11:33:40 -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 |
|
Leonardo Murillo
|
d81e52f6d7
|
Bringing spaceserver into interface repo - adding CMake target
|
2013-02-12 22:10:44 -06:00 |
|
Stephen Birarda
|
63070b4d3c
|
link thread library to mixer target
|
2013-02-12 18:06:31 -08:00 |
|
Stephen Birarda
|
b92d8daa1d
|
more mixer cleanup, UDPSocket hook up
|
2013-02-12 17:59:23 -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
|
4aca25297b
|
rename socket.cpp to main.cpp, camelcase variables
|
2013-02-12 17:04:00 -08:00 |
|
Stephen Birarda
|
c45eeb2a51
|
add mixer subdirectory to root CMakeLists.txt
|
2013-02-12 16:52:38 -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
|
1ba48cf7fe
|
make LODEPNG_INCLUDE_DIRS should be dir, not file
|
2013-02-12 11:55:46 -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 |
|