From 471c9a3dad544046d0ba0070d1dc7ad204da0a0a Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 14 Jun 2013 09:18:01 -0700 Subject: [PATCH 1/2] added local mode --- audio-mixer/src/main.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 7276a24594..c8ffa5d55d 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -74,10 +74,20 @@ struct SharedAudioFactors { float distanceCoefficient; float effectMix; }; +bool wantLocalDomain = false; int main(int argc, const char* argv[]) { setvbuf(stdout, NULL, _IOLBF, 0); + // Handle Local Domain testing with the --local command line + const char* local = "--local"; + ::wantLocalDomain = cmdOptionExists(argc, argv,local); + if (::wantLocalDomain) { + printf("Local Domain MODE!\n"); + int ip = getLocalAddress(); + sprintf(DOMAIN_IP,"%d.%d.%d.%d", (ip & 0xFF), ((ip >> 8) & 0xFF),((ip >> 16) & 0xFF), ((ip >> 24) & 0xFF)); + } + AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT); ssize_t receivedBytes = 0; From 5d6a5a737765d3cb2d46124d6809891104d336e3 Mon Sep 17 00:00:00 2001 From: ZappoMan Date: Fri, 14 Jun 2013 09:22:14 -0700 Subject: [PATCH 2/2] Removed accidentally merged code --- audio-mixer/src/main.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index df4716c08d..1297d6d0eb 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -70,10 +70,6 @@ void attachNewBufferToAgent(Agent *newAgent) { } } -struct SharedAudioFactors { - float distanceCoefficient; - float effectMix; -}; bool wantLocalDomain = false; int main(int argc, const char* argv[]) {