From edc908b1cd23265671197184223508d3c09315fc Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Thu, 25 Apr 2013 16:25:49 -0700 Subject: [PATCH] AgentList type squishes across project --- audio-mixer/src/main.cpp | 4 ++-- avatar-mixer/src/main.cpp | 2 +- domain-server/src/main.cpp | 2 +- interface/src/main.cpp | 4 ++-- libraries/shared/src/AgentList.cpp | 4 ++-- voxel-server/src/main.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp index 4e692024c4..7ad0f4e8a3 100644 --- a/audio-mixer/src/main.cpp +++ b/audio-mixer/src/main.cpp @@ -78,7 +78,7 @@ void *sendBuffer(void *args) int nextFrame = 0; timeval startTime; - AgentList *agentList = AgentList::getInstance(); + AgentList* agentList = AgentList::getInstance(); gettimeofday(&startTime, NULL); @@ -254,7 +254,7 @@ void attachNewBufferToAgent(Agent *newAgent) { int main(int argc, const char * argv[]) { - AgentList *agentList = AgentList::createInstance(AGENT_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT); + AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AUDIO_MIXER, MIXER_LISTEN_PORT); setvbuf(stdout, NULL, _IOLBF, 0); ssize_t receivedBytes = 0; diff --git a/avatar-mixer/src/main.cpp b/avatar-mixer/src/main.cpp index 82d75fa0fb..13492639eb 100644 --- a/avatar-mixer/src/main.cpp +++ b/avatar-mixer/src/main.cpp @@ -53,7 +53,7 @@ void attachAvatarDataToAgent(Agent *newAgent) { int main(int argc, char* argv[]) { - AgentList *agentList = AgentList::createInstance(AGENT_TYPE_AVATAR_MIXER, AVATAR_LISTEN_PORT); + AgentList* agentList = AgentList::createInstance(AGENT_TYPE_AVATAR_MIXER, AVATAR_LISTEN_PORT); setvbuf(stdout, NULL, _IOLBF, 0); agentList->linkedDataCreateCallback = attachAvatarDataToAgent; diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp index 523a97c25f..8c862fa934 100644 --- a/domain-server/src/main.cpp +++ b/domain-server/src/main.cpp @@ -62,7 +62,7 @@ unsigned char* addAgentToBroadcastPacket(unsigned char* currentPosition, Agent* int main(int argc, const char * argv[]) { - AgentList *agentList = AgentList::createInstance(AGENT_TYPE_DOMAIN, DOMAIN_LISTEN_PORT); + AgentList* agentList = AgentList::createInstance(AGENT_TYPE_DOMAIN, DOMAIN_LISTEN_PORT); // If user asks to run in "local" mode then we do NOT replace the IP // with the EC2 IP. Otherwise, we will replace the IP like we used to // this allows developers to run a local domain without recompiling the diff --git a/interface/src/main.cpp b/interface/src/main.cpp index 48f41af7b9..1d5b9b50dc 100644 --- a/interface/src/main.cpp +++ b/interface/src/main.cpp @@ -980,7 +980,7 @@ void display(void) glPointSize(1.0f); char agents[100]; - AgentList *agentList = AgentList::getInstance(); + AgentList* agentList = AgentList::getInstance(); int totalAvatars = 0, totalServers = 0; for (AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { @@ -1495,7 +1495,7 @@ void idle(void) { updateAvatar(deltaTime); //loop through all the other avatars and simulate them... - AgentList * agentList = AgentList::getInstance(); + AgentList* agentList = AgentList::getInstance(); for(AgentList::iterator agent = agentList->begin(); agent != agentList->end(); agent++) { if (agent->getLinkedData() != NULL) { Avatar *avatar = (Avatar *)agent->getLinkedData(); diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp index 73855d4879..2c7d6cf25d 100644 --- a/libraries/shared/src/AgentList.cpp +++ b/libraries/shared/src/AgentList.cpp @@ -327,7 +327,7 @@ Agent* AgentList::soloAgentOfType(char agentType) { void *pingUnknownAgents(void *args) { - AgentList *agentList = (AgentList *)args; + AgentList* agentList = (AgentList*) args; const int PING_INTERVAL_USECS = 1 * 1000000; timeval lastSend; @@ -410,7 +410,7 @@ void *checkInWithDomainServer(void *args) { const int DOMAIN_SERVER_CHECK_IN_USECS = 1 * 1000000; - AgentList *parentAgentList = (AgentList *)args; + AgentList* parentAgentList = (AgentList*) args; timeval lastSend; unsigned char output[7]; diff --git a/voxel-server/src/main.cpp b/voxel-server/src/main.cpp index 9be9611048..a3c018765a 100644 --- a/voxel-server/src/main.cpp +++ b/voxel-server/src/main.cpp @@ -137,7 +137,7 @@ void eraseVoxelTreeAndCleanupAgentVisitData() { void *distributeVoxelsToListeners(void *args) { - AgentList *agentList = AgentList::getInstance(); + AgentList* agentList = AgentList::getInstance(); timeval lastSendTime; unsigned char *stopOctal; @@ -236,7 +236,7 @@ void attachVoxelAgentDataToAgent(Agent *newAgent) { int main(int argc, const char * argv[]) { - AgentList *agentList = AgentList::createInstance(AGENT_TYPE_VOXEL, VOXEL_LISTEN_PORT); + AgentList* agentList = AgentList::createInstance(AGENT_TYPE_VOXEL, VOXEL_LISTEN_PORT); setvbuf(stdout, NULL, _IOLBF, 0); // Handle Local Domain testing with the --local command line