Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 10:14:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge remote-tracking branch 'origin'

Browse source
This commit is contained in:
Philip Rosedale 2013-02-18 09:17:54 -08:00
commit c0968e9967
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/src/Agent.cpp
View file

@ -199,7 +199,7 @@ void setAgentPing(char * address, unsigned short port) {
void kludgyMixerUpdate(Audio audio) {
for (int i = 0; i < num_agents; i++) {
if (agents[i].agentType == 'M') {
audio.updateMixerParams(agents[i].public_address, agents[i].public_port);
audio.updateMixerParams(agents[i].private_address, agents[i].private_port);
}
}
}

2
mixer/src/main.cpp
View file

@ -229,7 +229,7 @@ void *reportAliveToDS(void *args) {
while (true) {
gettimeofday(&lastSend, NULL);
sprintf(output, "%c %f,%f,%f", 'M', 0.f, 0.f, 0.f);
sprintf(output, "%c %f,%f,%f,54.241.92.53 %hd", 'M', 0.f, 0.f, 0.f, MIXER_LISTEN_PORT);
int packetSize = strlen(output);
audioSocket.send(DOMAIN_IP, DOMAINSERVER_PORT, output, packetSize);