From 2c242a7704ad068ebe13bb3d749bb3b0503cc6c8 Mon Sep 17 00:00:00 2001 From: Stephen Birarda Date: Wed, 15 May 2013 14:02:09 -0700 Subject: [PATCH] add AGENT_TYPE_AUDIO_INJECTOR to getTypeName, refactor --- libraries/shared/src/Agent.cpp | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/libraries/shared/src/Agent.cpp b/libraries/shared/src/Agent.cpp index a8a47b6134..acdce6a671 100644 --- a/libraries/shared/src/Agent.cpp +++ b/libraries/shared/src/Agent.cpp @@ -142,28 +142,26 @@ const char* AGENT_TYPE_NAME_VOXEL = "Voxel Server"; const char* AGENT_TYPE_NAME_INTERFACE = "Client Interface"; const char* AGENT_TYPE_NAME_AUDIO_MIXER = "Audio Mixer"; const char* AGENT_TYPE_NAME_AVATAR_MIXER = "Avatar Mixer"; +const char* AGENT_TYPE_NAME_AUDIO_INJECTOR = "Audio Injector"; const char* AGENT_TYPE_NAME_UNKNOWN = "Unknown"; const char* Agent::getTypeName() const { - const char* name = AGENT_TYPE_NAME_UNKNOWN; switch (this->type) { case AGENT_TYPE_DOMAIN: - name = AGENT_TYPE_NAME_DOMAIN; - break; + return AGENT_TYPE_NAME_DOMAIN; case AGENT_TYPE_VOXEL: - name = AGENT_TYPE_NAME_VOXEL; - break; + return AGENT_TYPE_NAME_VOXEL; case AGENT_TYPE_AVATAR: - name = AGENT_TYPE_NAME_INTERFACE; - break; + return AGENT_TYPE_NAME_INTERFACE; case AGENT_TYPE_AUDIO_MIXER: - name = AGENT_TYPE_NAME_AUDIO_MIXER; - break; + return AGENT_TYPE_NAME_AUDIO_MIXER; case AGENT_TYPE_AVATAR_MIXER: - name = AGENT_TYPE_NAME_AVATAR_MIXER; - break; + return AGENT_TYPE_NAME_AVATAR_MIXER; + case AGENT_TYPE_AUDIO_INJECTOR: + return AGENT_TYPE_NAME_AUDIO_INJECTOR; + default: + return AGENT_TYPE_NAME_UNKNOWN; } - return name; } void Agent::setType(char newType) {