retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

FS-11340: [core] fix merge conflict

This commit is contained in:
Mike Jerris 2018-09-25 15:22:54 +00:00
parent 710d011c85
commit a747db947c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/switch_vad.c
View File

@ -60,14 +60,14 @@ struct switch_vad_s {
SWITCH_DECLARE(const char *) switch_vad_state2str(switch_vad_state_t state)
{
switch(state) {
case SWITCH_VAD_STATE_NONE: return "none";
case SWITCH_VAD_STATE_NONE:
return "none";
case SWITCH_VAD_STATE_START_TALKING: return "start_talking";
return "start-talking";
case SWITCH_VAD_STATE_TALKING: return "talking";
case SWITCH_VAD_STATE_START_TALKING:
return "start_talking";
case SWITCH_VAD_STATE_TALKING:
return "talking";
case SWITCH_VAD_STATE_STOP_TALKING: return "stop_talking";
return "stop-talking";
case SWITCH_VAD_STATE_STOP_TALKING:
return "stop_talking";
default:
return "error";
}