retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

Added tones language support to pbx assistant. 

git-svn-id: http://voip.null.ro/svn/yate@4037 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2011-01-18 12:19:02 +00:00
parent 1978cacf2e
commit 9a9eb8fc55
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conf.d/pbxassist.conf.sample
View File

@ -38,6 +38,10 @@
; retake: string: Exact sequence to exit DTMF pass-through mode
;retake=###
; lang: string: Language for tones used by the pbx
; This parameter can be overridden from routing by a 'pbxlang' parameter
;lang=
; Every other section defines an operation to trigger
;[operation]

8
modules/server/pbxassist.cpp
View File

@ -133,6 +133,9 @@ static String s_onhold;
// error beep override source name
static String s_error;
// Language parameter for tones played by the pbx
static String s_lang;
// on-hangup transfer list
static ObjList s_transList;
static Mutex s_transMutex(false,"PBXAssist::transfer");
@ -229,6 +232,7 @@ void PBXList::initialize()
s_retake = s_cfg.getValue("general","retake","###");
s_onhold = s_cfg.getValue("general","onhold","moh/default");
s_error = s_cfg.getValue("general","error","tone/outoforder");
s_lang = s_cfg.getValue("general","lang");
unlock();
if (s_cfg.getBoolValue("general","enabled",false))
ChanAssistList::initialize();
@ -418,6 +422,7 @@ bool PBXAssist::msgDisconnect(Message& msg, const String& reason)
return false;
Message *m = c->message("call.execute",false,true);
m->addParam("callto","tone/dial");
m->addParam("lang",m_keep.getValue("pbxlang",s_lang),false);
m->addParam("reason","hold");
m->addParam("pbxstate",state());
Engine::enqueue(m);
@ -555,6 +560,7 @@ void PBXAssist::putPrompt(const char* source, const char* reason)
m->addParam("id",id());
m->addParam("pbxstate",state());
m->addParam("override",source);
m->addParam("lang",m_keep.getValue("pbxlang",s_lang),false);
m->addParam("single","yes");
if (reason)
m->addParam("reason",reason);
@ -825,6 +831,7 @@ bool PBXAssist::operOnHold(Message& msg)
m->addParam("id",id());
m->addParam("callto","tone/dial");
m->addParam("message","call.execute");
m->addParam("lang",m_keep.getValue("pbxlang",s_lang),false);
m->addParam("reason",reason,false);
copyParams(*m,msg);
setState("dial");
@ -880,6 +887,7 @@ bool PBXAssist::operReturnTone(Message& msg, const char* reason)
Message* m = new Message("chan.masquerade");
m->addParam("id",id());
m->addParam("callto","tone/dial");
m->addParam("lang",m_keep.getValue("pbxlang",s_lang),false);
m->addParam("message","call.execute");
m->addParam("pbxstate",state());
if (reason)