From 9658c40dd6126ffabdf8c62b6a29b699e956e125 Mon Sep 17 00:00:00 2001
From: Stephen Birarda <commit@birarda.com>
Date: Tue, 7 May 2013 17:17:47 -0700
Subject: [PATCH] change lastAgentId member variable to _lastAgentID

---
 audio-mixer/src/main.cpp           |  4 ++--
 domain-server/src/main.cpp         |  4 ++--
 libraries/shared/src/AgentList.cpp | 10 +---------
 libraries/shared/src/AgentList.h   |  8 ++++----
 4 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/audio-mixer/src/main.cpp b/audio-mixer/src/main.cpp
index b554d011d3..c47fbb2170 100644
--- a/audio-mixer/src/main.cpp
+++ b/audio-mixer/src/main.cpp
@@ -282,8 +282,8 @@ int main(int argc, const char* argv[]) {
         if(agentList->getAgentSocket().receive(agentAddress, packetData, &receivedBytes)) {
             if (packetData[0] == PACKET_HEADER_INJECT_AUDIO) {
                 
-                if (agentList->addOrUpdateAgent(agentAddress, agentAddress, packetData[0], agentList->getLastAgentId())) {
-                    agentList->increaseAgentId();
+                if (agentList->addOrUpdateAgent(agentAddress, agentAddress, packetData[0], agentList->getLastAgentID())) {
+                    agentList->increaseAgentID();
                 }
                 
                 agentList->updateAgentWithData(agentAddress, packetData, receivedBytes);
diff --git a/domain-server/src/main.cpp b/domain-server/src/main.cpp
index 95da95c210..be906e194d 100644
--- a/domain-server/src/main.cpp
+++ b/domain-server/src/main.cpp
@@ -118,8 +118,8 @@ int main(int argc, const char * argv[])
             if (agentList->addOrUpdateAgent((sockaddr*) &agentPublicAddress,
                                            (sockaddr*) &agentLocalAddress,
                                            agentType,
-                                           agentList->getLastAgentId())) {
-                agentList->increaseAgentId();
+                                           agentList->getLastAgentID())) {
+                agentList->increaseAgentID();
             }
             
             currentBufferPos = broadcastPacket + 1;
diff --git a/libraries/shared/src/AgentList.cpp b/libraries/shared/src/AgentList.cpp
index 0ff8184f07..df591524c0 100644
--- a/libraries/shared/src/AgentList.cpp
+++ b/libraries/shared/src/AgentList.cpp
@@ -65,7 +65,7 @@ AgentList::AgentList(char newOwnerType, unsigned int newSocketListenPort) :
     _ownerType(newOwnerType),
     socketListenPort(newSocketListenPort),
     _ownerID(UNKNOWN_AGENT_ID),
-    lastAgentId(0) {
+    _lastAgentID(0) {
     pthread_mutex_init(&mutex, 0);
 }
 
@@ -192,14 +192,6 @@ Agent* AgentList::agentWithID(uint16_t agentID) {
     return NULL;
 }
 
-uint16_t AgentList::getLastAgentId() {
-    return lastAgentId;
-}
-
-void AgentList::increaseAgentId() {
-    ++lastAgentId;
-}
-
 int AgentList::processDomainServerList(unsigned char *packetData, size_t dataBytes) {
     int readAgents = 0;
 
diff --git a/libraries/shared/src/AgentList.h b/libraries/shared/src/AgentList.h
index 1956916211..db71357114 100644
--- a/libraries/shared/src/AgentList.h
+++ b/libraries/shared/src/AgentList.h
@@ -52,9 +52,6 @@ public:
     
     UDPSocket& getAgentSocket();
     
-    uint16_t getLastAgentId();
-    void increaseAgentId();
-    
     void lock() { pthread_mutex_lock(&mutex); }
     void unlock() { pthread_mutex_unlock(&mutex); }
     
@@ -76,6 +73,9 @@ public:
     
     char getOwnerType() const { return _ownerType; }
     
+    uint16_t getLastAgentID() const { return _lastAgentID; }
+    void increaseAgentID() { ++_lastAgentID; }
+    
     uint16_t getOwnerID() const { return _ownerID; }
     void setOwnerID(uint16_t ownerID) { _ownerID = ownerID; }
     
@@ -105,7 +105,7 @@ private:
     char _ownerType;
     unsigned int socketListenPort;
     uint16_t _ownerID;
-    uint16_t lastAgentId;
+    uint16_t _lastAgentID;
     pthread_t removeSilentAgentsThread;
     pthread_t checkInWithDomainServerThread;
     pthread_t pingUnknownAgentsThread;