Merge pull request #318 from birarda/master

add audio injector the getTypeName switch case
This commit is contained in:
birarda 2013-05-15 14:02:52 -07:00
commit f71b342b8e

View file

@ -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_INTERFACE = "Client Interface";
const char* AGENT_TYPE_NAME_AUDIO_MIXER = "Audio Mixer"; const char* AGENT_TYPE_NAME_AUDIO_MIXER = "Audio Mixer";
const char* AGENT_TYPE_NAME_AVATAR_MIXER = "Avatar 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_TYPE_NAME_UNKNOWN = "Unknown";
const char* Agent::getTypeName() const { const char* Agent::getTypeName() const {
const char* name = AGENT_TYPE_NAME_UNKNOWN;
switch (this->type) { switch (this->type) {
case AGENT_TYPE_DOMAIN: case AGENT_TYPE_DOMAIN:
name = AGENT_TYPE_NAME_DOMAIN; return AGENT_TYPE_NAME_DOMAIN;
break;
case AGENT_TYPE_VOXEL: case AGENT_TYPE_VOXEL:
name = AGENT_TYPE_NAME_VOXEL; return AGENT_TYPE_NAME_VOXEL;
break;
case AGENT_TYPE_AVATAR: case AGENT_TYPE_AVATAR:
name = AGENT_TYPE_NAME_INTERFACE; return AGENT_TYPE_NAME_INTERFACE;
break;
case AGENT_TYPE_AUDIO_MIXER: case AGENT_TYPE_AUDIO_MIXER:
name = AGENT_TYPE_NAME_AUDIO_MIXER; return AGENT_TYPE_NAME_AUDIO_MIXER;
break;
case AGENT_TYPE_AVATAR_MIXER: case AGENT_TYPE_AVATAR_MIXER:
name = AGENT_TYPE_NAME_AVATAR_MIXER; return AGENT_TYPE_NAME_AVATAR_MIXER;
break; case AGENT_TYPE_AUDIO_INJECTOR:
return AGENT_TYPE_NAME_AUDIO_INJECTOR;
default:
return AGENT_TYPE_NAME_UNKNOWN;
} }
return name;
} }
void Agent::setType(char newType) { void Agent::setType(char newType) {